Changeset 245 for tbroadcast

Timestamp:

Sep 8, 2006, 11:39:11 AM (18 years ago)

Author:

garonne

Message:

correction du bug os.chdir de python

Location:

tbroadcast/v2

Files:

• python/tbroadcast.py (modified) (5 diffs)
• scripts/tbroadcast (modified) (4 diffs)

tbroadcast/v2/python/tbroadcast.py

@@ -26 +26 @@
 class Scheduler:
 
-    def __init__(self, num_workers=20, file=None, ignore_cycles=False, local=False, output=None, error=None, silent = False):
+    def __init__(self, num_workers=20, file=None, ignore_cycles=False, local=False, output=None, error=None, silent = False, perf=False):
         self.pool            = ThreadPool(num_workers=num_workers)
         self.current_package = self.get_current_package()
@@ -38 +38 @@
         self.error           = error
         self.silent          = silent
+        self.perf            = perf
+        if self.perf:
+            f = open ('performances.log', 'w+')
+            f.close()
         if output is not None:
             if not os.path.exists (output):
@@ -410 +414 @@
       #print "**Result: %s from request #%s" % (str(result), request.requestID)
       #print "# Result: %s from request #%s" % (result['package'], request.requestID)
-      self.execute (result['cmd'])
+      #if result['package'] == 'CodeCheck':
+      #    sys.exit(-1)
+      self.execute (result['cmd'])    
 
     # the work the threads will have to do 
     def do_execute(self, arg):
       path = self.get_work_area_path (arg['package'])
-      if path == None:
+      if path == None or not os.path.exists(path):
           raise RuntimeError('Path to package '+ arg['package'] +' not found')
       self.set_work_unit_status (arg['package'], 'running')      
-      cmd = "cmt -use="+ arg['package'] + " run '"+ arg['cmd'] + "'"
-      os.chdir(path)        
+      #cmd = "cmt -use="+ arg['package'] + " run '"+ arg['cmd'] + "'"      
+      #os.chdir(path)
+      #arg['cmd'] = "cd "+ path +";"+ arg['cmd']
       print '#--------------------------------------------------------------'
       print '# ('+str(self.get_counter())+'/'+str(len(self.packages))+') Now trying ['+ arg['cmd']+'] in ' + path
       print '#--------------------------------------------------------------'
-      cmd = arg['cmd'] 
+      cmd = "cd "+ path +";"+ arg['cmd'] 
       #status, output= commands.getstatusoutput(cmd)
       # init output file
@@ -431 +438 @@
            if self.error is not None:
                f = open (self.error+'/'+arg['package']+'_error.log', 'w+')
-               f.close()            
+               f.close()
+      self.packages[arg['package']] ['startTime'] = time.time ()                     
       status, output, error, pythonError  = exeCommand(sCmd=cmd, oLineCallback=self.redirectOutput, arg=arg)#,iTimeout = 3600)
+      self.packages[arg['package']] ['endTime'] = time.time ()
+      if self.perf:
+          self.semaphore.acquire ()        
+          f = open ('performances.log', 'a')
+          f.write (arg['package']+" "+str(self.packages[arg['package']] ['startTime'])+" "+str(self.packages[arg['package']] ['endTime'] )+'\n')  
+          f.close()
+          self.semaphore.release()
       self.suppress_work_unit (arg['package'])
       self.set_work_unit_status (arg['package'], 'done')
@@ -465 +480 @@
       #print "# Exception occured in request #%s: %s" %(request.requestID, exc_info[1])
       print "# Exception occured: %s" %(exc_info[1])
+      print exc_info
       print '#--------------------------------------------------------------'    
-      sys.exit(-1)
-
+      #sys.exit(-1)
 
 #--------- EoF --------#

tbroadcast/v2/scripts/tbroadcast

@@ -40 +40 @@
     ignore_cycles = False
     silent        = False
+    perf          = False     
     output        = None
     error         = None
@@ -50 +51 @@
              if option == '-f':
                 file = string.split(arg,'=')[1]
+             if option == '-perf':
+                perf = True
              if option == '-output':
                 output = string.split(arg,'=')[1]
@@ -59 +62 @@
                  ignore_cycles = True
              if option == '-silent':             
-                 silent = True
-                 
+                 silent = True                 
              if option == '-help':    
                   usage()
@@ -74 +76 @@
               command = arg
 
-    master = Scheduler (num_workers=num_worker, file=file, ignore_cycles=ignore_cycles, local=local, output=output, error=error, silent=silent)
+    master = Scheduler (num_workers=num_worker, file=file, ignore_cycles=ignore_cycles, local=local, output=output, error=error, silent=silent, perf=perf)
     if test:
         master.simulate_execution()