Changeset 36 for trunk/oarutils/oar-parexec

Timestamp:

Dec 3, 2011, 8:20:09 AM (13 years ago)

Author:

g7moreau

Message:

• Small bug correction

File:

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

trunk/oarutils/oar-parexec

@@ -87 +87 @@
 async {
    for my $job (@job) {
-      my $nodes = $ressources->get;
+      my $job_ressource = $ressources->get;
 
       $job_num++;
 
-      my ($node_connect) = split ',', $nodes;
+      my ($node_connect) = split ',', $job_ressource;
       my $fh      = IO::File->new();
       my $job_pid = $fh->open("| $oarsh $node_connect >/dev/null 2>&1")
@@ -99 +99 @@
       $fh = unblock $fh;
 
-      $scheduled{$job_pid} = { fh => $fh, node_connect => $node_connect, nodes => $nodes, num => $job_num };
-
-      printf "start job %5i / %5i on node %s at %s\n",
-         $job_num, $job_pid, $node_connect, time
+      $scheduled{$job_pid} = { fh => $fh, node_connect => $node_connect, ressource => $job_ressource, num => $job_num };
+
+      printf "start job %5i / %5i at %s on node %s\n",
+         $job_num, $job_pid, time, $job_ressource
          if $verbose;
 
@@ -109 +109 @@
       $job_stderr = "2> $stderr-$job_num.stderr" if $stderr ne '' and $switchio;
 
-      my $job_nodefile = "/tmp/oar-parexec-$ENV{USERNAME}-$job_num";
+      my $job_nodefile = "/tmp/oar-parexec-$ENV{LOGNAME}-$job_num";
 
       if ($job_np > 1) {
-         $fh->print("printf \".join('\n',split(',',$nodes)).\" > $job_nodefile\n");
-         $fh->print("OAR_NODE_FILE=$job_nodefile\n");
+         $fh->print("printf \""
+            . join('\n',split(',',$job_ressource,))
+            . "\" > $job_nodefile\n");
+         $fh->print("OAR_NODEFILE=$job_nodefile\n");
          $fh->print("OAR_NP=$job_np\n");
-         $fh->print("export OAR_NODE_FILE\n");
+         $fh->print("export OAR_NODEFILE\n");
          $fh->print("export OAR_NP\n");
          $fh->print("unset OAR_MSG_NODEFILE\n");
@@ -131 +133 @@
       for my $job_pid ( keys %scheduled ) {
          if ( waitpid( $job_pid, WNOHANG ) ) {
-            printf "end   job %5i / %5i on node %s at %s\n",
+            printf "end   job %5i / %5i at %s on node %s\n",
                $scheduled{$job_pid}->{num},
-               $job_pid, $scheduled{$job_pid}->{node_connect}, time
+               $job_pid, time,
+               $scheduled{$job_pid}->{ressource}
                if $verbose;
             close $scheduled{$job_pid}->{fh};
-            $ressources->put( $scheduled{$job_pid}->{nodes} );
+            $ressources->put( $scheduled{$job_pid}->{ressource} );
             $job_todo->down;
             delete $scheduled{$job_pid};