Changeset 84 for trunk/oarutils

Timestamp:

Jun 1, 2012, 11:26:37 PM (13 years ago)

Author:

g7moreau

Message:

• Error with comment in cmdfile...

File:

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

trunk/oarutils/oar-parexec

@@ -149 +149 @@
 # OAR checkpoint and default signal SIGUSR2
 my $oar_checkpoint = new Coro::Semaphore 0;
+my $notify         = new Coro::Signal;
 $SIG{$sig_checkpoint} = sub {
    print "warning: receive checkpoint at "
@@ -155 +156 @@
       if $verbose;
    $oar_checkpoint->up();
+   $notify->send if $sig_transmit;
    };
 
 # asynchrone notify job
 async {
-   NOTIFY:
    while () {
-      # only notify with transmit flag
-      if ($sig_transmit and $oar_checkpoint->count() > 0) {
-
-     for my $job_pid (keys %scheduled) {
-        my $job_name     = $scheduled{$job_pid}->{name};
-        my $job_pidfile  = $scheduled{$job_pid}->{pidfile};
-        my $node_connect = $scheduled{$job_pid}->{node_connect};
-
-        my $fh = IO::File->new();
-        $fh->open("| $oarsh $node_connect >/dev/null 2>&1")
-           or die "error: can't notify subjob: $!";
-
-        $fh->autoflush;
-        $fh = unblock $fh;
-
-        $fh->print("kill -$sig_checkpoint \$(cat $job_pidfile)");
-        $fh->print("exit\n");
-
-        print "warning: transmit signal $sig_checkpoint"
-           . " to $job_name on $node_connect.\n"
-           if $verbose;
-
-        close $fh;
-        cede;
-        }
+      $notify->wait;
+
+      for my $job_pid (keys %scheduled) {
+         my $job_name     = $scheduled{$job_pid}->{name};
+         my $job_pidfile  = $scheduled{$job_pid}->{pidfile};
+         my $node_connect = $scheduled{$job_pid}->{node_connect};
+
+         my $fh = IO::File->new();
+         $fh->open("| $oarsh $node_connect >/dev/null 2>&1")
+            or die "error: can't notify subjob: $!";
+
+         $fh->autoflush;
+         $fh = unblock $fh;
+
+         $fh->print("kill -$sig_checkpoint \$(cat $job_pidfile)\n");
+         $fh->print("exit\n");
+
+         print "warning: transmit signal $sig_checkpoint"
+            . " to job $job_name on node $node_connect.\n"
+            if $verbose;
+
+         close $fh;
+         cede;
          }
-
-      cede;
       }
    }
@@ -248 +245 @@
          pidfile      => $job_pidfile,
          };
+
+      $job_cmd =~ s/(\s+##.*)$//; # suppress comment
 
       # set job environment, run it and clean
@@ -265 +264 @@
          $fh->print("trap 'kill -$sig_checkpoint \$(jobs -p)' $sig_checkpoint\n");
          $fh->print("echo \$\$ > $job_pidfile\n");
-         $fh->print("$job_cmd $job_stdout $job_stderr &\n");
+         $fh->print("$job_cmd $job_stdout $job_stderr \&\n");
          $fh->print("while [ \$(jobs -p | wc -l) -gt 0 ]\n");
          $fh->print("do\n");