Changeset 35

Timestamp:

Dec 1, 2011, 11:47:20 PM (13 years ago)

Author:

g7moreau

Message:

• Small bug about array ref -> string

File:

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

trunk/oarutils/oar-parexec

@@ -60 +60 @@
 
 my $ressource_size = scalar(@ressources);
-die "not enought ressources jobnp $job_np > ressources $ressource_size" if not $job_np > $ressource_size;
+die "not enought ressources jobnp $job_np > ressources $ressource_size" if $job_np > $ressource_size;
 
 my $current_dir = getcwd();
@@ -78 +78 @@
 my $ressources = new Coro::Channel;
 for my $slot (1 .. int($ressource_size / $job_np)) {
-   $ressources->put( [ @ressources[(($slot - 1) * $job_np) .. (($slot * $job_np) - 1)] ] );
+   $ressources->put( join(',', @ressources[(($slot - 1) * $job_np) .. (($slot * $job_np) - 1)] ) );
    }
 
@@ -91 +91 @@
       $job_num++;
 
-      my $node_connect = $nodes->[0];
+      my ($node_connect) = split ',', $nodes;
       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 => $node_connect, num => $job_num };
+      $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",
@@ -112 +112 @@
 
       if ($job_np > 1) {
-         $fh->print("printf \".join('\n',@{$nodes}).\" > $job_nodefile\n");
+         $fh->print("printf \".join('\n',split(',',$nodes)).\" > $job_nodefile\n");
          $fh->print("OAR_NODE_FILE=$job_nodefile\n");
          $fh->print("OAR_NP=$job_np\n");
@@ -133 +133 @@
             printf "end   job %5i / %5i on node %s at %s\n",
                $scheduled{$job_pid}->{num},
-               $job_pid, $scheduled{$job_pid}->{node}, time
+               $job_pid, $scheduled{$job_pid}->{node_connect}, time
                if $verbose;
             close $scheduled{$job_pid}->{fh};
-            $ressources->put( $scheduled{$job_pid}->{node} );
+            $ressources->put( $scheduled{$job_pid}->{nodes} );
             $job_todo->down;
             delete $scheduled{$job_pid};