Changeset 83 for trunk/oarutils

Timestamp:

Jun 1, 2012, 5:58:28 PM (13 years ago)

Author:

g7moreau

Message:

• Add folder parameter
• Rewrite notify async section

File:

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

trunk/oarutils/oar-parexec

@@ -82 +82 @@
       my ($job_name) = $job_cmd =~ m/#.*?\bname=(\S+?)\b/i;
       $job_name ||= $job_num;
-      push @job, { name => $job_name, cmd => "$job_cmd" };
+      my ($job_folder) = $job_cmd =~ m/#.*?\bfolder=(\S+?)\b/i;
+      $job_folder ||= './';
+      push @job, { name => $job_name, cmd => "$job_cmd", folder => $job_folder };
       }
    close JOB_LIST;
@@ -157 +159 @@
 # asynchrone notify job
 async {
+   NOTIFY:
    while () {
-      next if $oar_checkpoint->count() == 0;
-
       # only notify with transmit flag
-      if (not $sig_transmit) {
-         cede;
-         next;
+      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;
+        }
          }
 
-      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;
-         }
+      cede;
       }
    }
@@ -195 +196 @@
    JOB:
    for my $job (@job) {
-      my $job_name = $job->{name};
-      my $job_cmd  = $job->{cmd};
+      my $job_name   = $job->{name};
+      my $job_cmd    = $job->{cmd};
+      my $job_folder = $job->{folder};
 
       # job has been already run ?
@@ -259 +261 @@
          }
       $fh->print("cd $current_dir\n");
+      $fh->print("cd $job_folder\n");
       if ($sig_transmit) {
          $fh->print("trap 'kill -$sig_checkpoint \$(jobs -p)' $sig_checkpoint\n");