Changeset 82 for trunk/oarutils

Timestamp:

Jun 1, 2012, 10:09:34 AM (13 years ago)

Author:

g7moreau

Message:

• Delete tab
• Tmp file more robust name

File:

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

trunk/oarutils/oar-parexec

@@ -21 +21 @@
 my $logtrace;
 my $verbose;
-my $job_np         = 1;
-my $nodefile       = $ENV{OAR_NODE_FILE} || '';
+my $job_np         = 1;
+my $nodefile       = $ENV{OAR_NODE_FILE} || '';
 my $masterio;
 my $switchio;
 my $help;
-my $oarsh          = 'oarsh -q -T';
+my $oarsh          = 'oarsh -q -T';
 my $sig_transmit;
 my $sig_checkpoint = 'USR2';
@@ -184 +184 @@
             . " to $job_name on $node_connect.\n"
             if $verbose;
-         
+
          close $fh;
          cede;
@@ -236 +236 @@
       $job_stderr = "2> $stderr-$job_name.stderr" if $stderr ne '' and $switchio;
 
-      my $job_nodefile = "/tmp/oar-parexec-$ENV{LOGNAME}-$job_name";
-      my $job_pidfile  = "/tmp/oar-parexec-$ENV{LOGNAME}-$job_name.pid";
+      my $job_nodefile = "/tmp/oar-parexec-$ENV{LOGNAME}-$ENV{OAR_JOB_ID}-$job_name";
+      my $job_pidfile  = "/tmp/oar-parexec-$ENV{LOGNAME}-$ENV{OAR_JOB_ID}-$job_name.pid";
 
       $scheduled{$job_pid} = {
@@ -282 +282 @@
    while () {
       for my $job_pid (keys %scheduled) {
-                        # non blocking PID test
+         # non blocking PID test
          if (waitpid($job_pid, WNOHANG)) {
             my $msg = sprintf "end   job %${job_name_maxlen}s / %5i at %s on node %s\n",
@@ -366 +366 @@
 You can use in your script the OAR original file ressources
 by using these variable if you need it.
- 
+
 
 =head1 OPTIONS