Changeset 348 for trunk/jobmond

Timestamp:

04/27/07 14:07:18 (16 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• made getJobData & submitJobData more uniform to work with multiple types of datagatherer

File:

• trunk/jobmond/jobmond.py (modified) (5 diffs)

trunk/jobmond/jobmond.py

@@ -339 +339 @@
                 while ( 1 ):
                 
-                        self.jobs = self.getJobData( self.jobs )
-                        self.submitJobData( self.jobs )
+                        self.getJobData()
+                        self.submitJobData()
                         time.sleep( BATCH_POLL_INTERVAL )       
 
@@ -513 +513 @@
                 return 0
 
-        def getJobData( self, known_jobs ):
+        def getJobData( self ):
                 """Gather all data on current jobs in Torque"""
-
-                if len( known_jobs ) > 0:
-                        jobs = known_jobs
-                else:
-                        jobs = { }
 
                 #self.initPbsQuery()
@@ -656 +651 @@
                         myAttrs['poll_interval'] = str( BATCH_POLL_INTERVAL )
 
-                        if self.jobDataChanged( jobs, job_id, myAttrs ) and myAttrs['status'] in [ 'R', 'Q' ]:
-                                jobs[ job_id ] = myAttrs
+                        if self.jobDataChanged( self.jobs, job_id, myAttrs ) and myAttrs['status'] in [ 'R', 'Q' ]:
+                                self.jobs[ job_id ] = myAttrs
 
                                 #debug_msg( 10, printTime() + ' job %s state changed' %(job_id) )
 
-                for id, attrs in jobs.items():
+                for id, attrs in self.jobs.items():
 
                         if id not in jobs_processed:
@@ -667 +662 @@
                                 # This one isn't there anymore; toedeledoki!
                                 #
-                                del jobs[ id ]
-
-                return jobs
-
-        def submitJobData( self, jobs ):
+                                del self.jobs[ id ]
+
+        def submitJobData( self ):
                 """Submit job info list"""
 
@@ -678 +671 @@
                 # Now let's spread the knowledge
                 #
-                for jobid, jobattrs in jobs.items():
+                for jobid, jobattrs in self.jobs.items():
 
                         gmetric_val = self.compileGmetricVal( jobid, jobattrs )