Changeset 41 for trunk/oarutils/oar-parexec

Timestamp:

Dec 5, 2011, 11:56:31 AM (13 years ago)

Author:

g7moreau

Message:

• Reformat oar-parexec with perltidy

File:

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

trunk/oarutils/oar-parexec

@@ -16 +16 @@
 use Cwd qw( getcwd );
 
-my $file = '';
+my $file    = '';
 my $logfile = '';
 my $verbose;
@@ -36 +36 @@
    'masterio=s' => \$masterio,
    'switchio'   => \$switchio,
-   ) || pod2usage( -verbose => 0 );
-pod2usage( -verbose => 2 ) if $help;
-pod2usage( -verbose => 2 ) if not -e $file;
+   ) || pod2usage(-verbose => 0);
+pod2usage(-verbose => 2) if $help;
+pod2usage(-verbose => 2) if not -e $file;
 
 my %state;
@@ -46 +46 @@
       or die "can't read log file: $!";
    while (<$log_h>) {
-                $state{$1} = 'start' if m/^start\s+job\s+(\d+)\s/;
-                $state{$1} = 'end'   if m/^end\s+job\s+(\d+)\s/;
-           }
+      $state{$1} = 'start' if m/^start\s+job\s+(\d+)\s/;
+      $state{$1} = 'end'   if m/^end\s+job\s+(\d+)\s/;
+      }
    $log_h->close();
    }
 if ($logfile) {
    $log_h->open(">> $logfile")
-         or die "can't append log file $logfile: $!";
+      or die "can't append log file $logfile: $!";
    $log_h->autoflush;
    $log_h = unblock $log_h;
@@ -59 +59 @@
 
 my @job = ();
-open( JOB_LIST, '<', "$file" ) or die "can't open job file $file: $!";
+open(JOB_LIST, '<', "$file") or die "can't open job file $file: $!";
 while (<JOB_LIST>) {
    chomp;
    next if m/^#/;
    next if m/^\s*$/;
-   push @job, $_ ;
+   push @job, $_;
    }
 close JOB_LIST;
 
 my @ressources = ();
-open( NODE_FILE, '<', "$nodefile" )
+open(NODE_FILE, '<', "$nodefile")
    or die "can't open $nodefile: $!";
 while (<NODE_FILE>) {
@@ -75 +75 @@
    next if m/^#/;
    next if m/^\s*$/;
-   push @ressources, $_ ;
+   push @ressources, $_;
    }
 close NODE_FILE;
 
 my $ressource_size = scalar(@ressources);
-die "not enought ressources jobnp $job_np > ressources $ressource_size" if $job_np > $ressource_size;
+die "not enought ressources jobnp $job_np > ressources $ressource_size"
+   if $job_np > $ressource_size;
 
 my $current_dir = getcwd();
@@ -91 +92 @@
 $stdout = $masterio if $masterio;
 
-
 my $finished = new Coro::Signal;
 my $job_todo = new Coro::Semaphore 0;
@@ -98 +98 @@
 my $ressources = new Coro::Channel;
 for my $slot (1 .. int($ressource_size / $job_np)) {
-   $ressources->put( join(',', @ressources[(($slot - 1) * $job_np) .. (($slot * $job_np) - 1)] ) );
-   }
-
+   $ressources->put(
+      join(',',
+         @ressources[ (($slot - 1) * $job_np) .. (($slot * $job_np) - 1) ])
+         );
+   }
 
 my $job_num   = 0;
@@ -106 +108 @@
 
 my $oar_checkpoint = new Coro::Semaphore 0;
-$SIG{USR2} = sub { $oar_checkpoint->up };
+$SIG{USR2} = sub {$oar_checkpoint->up};
 
 async {
@@ -113 +115 @@
 
       if (exists $state{$job_num}) {
-         if ($state{$job_num} eq 'start') {
-            print "warning: job $job_num was not finished, relaunching...\n" if $verbose;
-            }
+         if ($state{$job_num} eq 'start') {
+            print "warning: job $job_num was not finished, relaunching...\n"
+               if $verbose;
+            }
          elsif ($state{$job_num} eq 'end') {
-            delete $state{$job_num};
-            $job_todo->down;
-            print "warning: job $job_num already done\n" if $verbose;
-            cede;
-            next;
-            }
-         }              
+            delete $state{$job_num};
+            $job_todo->down;
+            print "warning: job $job_num already done\n" if $verbose;
+            cede;
+            next;
+            }
+         }
 
       my $job_ressource = $ressources->get;
@@ -130 +133 @@
 
       my ($node_connect) = split ',', $job_ressource;
-      my $fh      = IO::File->new();
+      my $fh = IO::File->new();
       my $job_pid = $fh->open("| $oarsh $node_connect >/dev/null 2>&1")
          or die "don't start subjob: $!";
@@ -137 +140 @@
       $fh = unblock $fh;
 
-      $scheduled{$job_pid} = { fh => $fh, node_connect => $node_connect, ressource => $job_ressource, num => $job_num };
+      $scheduled{$job_pid} = {
+         fh           => $fh,
+         node_connect => $node_connect,
+         ressource    => $job_ressource,
+         num          => $job_num
+         };
 
       $log_h->printf("start job %5i at %s\n", $job_num, time) if $logfile;
@@ -144 +152 @@
          if $verbose;
 
-      my ( $job_stdout, $job_stderr );
+      my ($job_stdout, $job_stderr);
       $job_stdout = ">  $stdout-$job_num.stdout" if $stdout ne '' and $switchio;
       $job_stderr = "2> $stderr-$job_num.stderr" if $stderr ne '' and $switchio;
@@ -152 +160 @@
       if ($job_np > 1) {
          $fh->print("printf \""
-            . join('\n',split(',',$job_ressource,))
-            . "\" > $job_nodefile\n");
+               . join('\n', split(',', $job_ressource,))
+               . "\" > $job_nodefile\n");
          $fh->print("OAR_NODE_FILE=$job_nodefile\n");
          $fh->print("OAR_NP=$job_np\n");
@@ -170 +178 @@
 async {
    while () {
-      for my $job_pid ( keys %scheduled ) {
-         if ( waitpid( $job_pid, WNOHANG ) ) {
+      for my $job_pid (keys %scheduled) {
+         if (waitpid($job_pid, WNOHANG)) {
             $log_h->printf("end   job %5i at %s\n",
-               $scheduled{$job_pid}->{num},
-               time) if $logfile;
+               $scheduled{$job_pid}->{num}, time)
+               if $logfile;
             printf "end   job %5i / %5i at %s on node %s\n",
                $scheduled{$job_pid}->{num},
-               $job_pid, time,
-               $scheduled{$job_pid}->{ressource}
+               $job_pid, time, $scheduled{$job_pid}->{ressource}
                if $verbose;
             close $scheduled{$job_pid}->{fh};
-            $ressources->put( $scheduled{$job_pid}->{ressource} );
+            $ressources->put($scheduled{$job_pid}->{ressource});
             $job_todo->down;
             delete $scheduled{$job_pid};
@@ -200 +207 @@
 
 $log_h->close() if $logfile;
-
 
 __END__