Changeset 42 for trunk/oarutils/oar-parexec

Timestamp:

Dec 5, 2011, 4:30:17 PM (13 years ago)

Author:

g7moreau

Message:

• Small polish

File:

• trunk/oarutils/oar-parexec (modified) (4 diffs)

trunk/oarutils/oar-parexec

@@ -108 +108 @@
 
 my $oar_checkpoint = new Coro::Semaphore 0;
-$SIG{USR2} = sub {$oar_checkpoint->up};
+$SIG{USR2} = sub {
+   print "warning: receive checkpoint at "
+      . time
+      . ", no new job, just finishing running job\n"
+      if $verbose;
+   $oar_checkpoint->up();
+   };
 
 async {
@@ -147 +153 @@
          };
 
-      $log_h->printf("start job %5i at %s\n", $job_num, time) if $logfile;
-      printf "start job %5i / %5i at %s on node %s\n",
-         $job_num, $job_pid, time, $job_ressource
-         if $verbose;
+      my $msg = sprintf "start job %5i / %5i at %s on node %s\n",
+         $job_num, $job_pid, time, $job_ressource;
+      $log_h->print($msg) if $logfile;
+      print($msg) if $verbose;
 
       my ($job_stdout, $job_stderr);
@@ -180 +186 @@
       for my $job_pid (keys %scheduled) {
          if (waitpid($job_pid, WNOHANG)) {
-            $log_h->printf("end   job %5i at %s\n",
-               $scheduled{$job_pid}->{num}, time)
-               if $logfile;
-            printf "end   job %5i / %5i at %s on node %s\n",
+            my $msg = sprintf "end   job %5i / %5i at %s on node %s\n",
                $scheduled{$job_pid}->{num},
-               $job_pid, time, $scheduled{$job_pid}->{ressource}
-               if $verbose;
+               $job_pid, time, $scheduled{$job_pid}->{ressource};
+            $log_h->print($msg) if $logfile;
+            print($msg) if $verbose;
             close $scheduled{$job_pid}->{fh};
             $ressources->put($scheduled{$job_pid}->{ressource});
@@ -195 +199 @@
          }
 
-      $finished->send if $oar_checkpoint->count > 0 and keys(%scheduled) == 0;
-
-      $finished->send if $job_todo->count == 0;
+      $finished->send if $oar_checkpoint->count() > 0 and scalar(keys(%scheduled)) == 0;
+
+      $finished->send if $job_todo->count() == 0;
       cede;
       }