Changeset 92

Timestamp:

Jan 24, 2013, 2:53:43 PM (12 years ago)

Author:

g7moreau

Message:

• Just format as usual (no tab, 3 space...)

File:

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

trunk/oarutils/oar-dispatch

@@ -10 +10 @@
 use Coro::Signal;
 use Coro::Semaphore;
+#use Coro::Timer qw(sleep);
 
 my $task = 0;
@@ -18 +19 @@
 
 Getopt::Long::GetOptions(
-        'task=i'                => \$task,
-        'overload=f'    => \$overload,
-        'file=s'                => \$file,
-        'verbose'       => \$verbose,
-        'help'          => \$help,
-        ) || pod2usage(-verbose => 0);
+   'task=i'       => \$task,
+   'overload=f'   => \$overload,
+   'file=s'       => \$file,
+   'verbose'      => \$verbose,
+   'help'         => \$help,
+   ) || pod2usage(-verbose => 0);
 pod2usage(-verbose => 2) if $help;
 
 if ($task == 0) {
-        open(NODE_FILE, '<', "$ENV{OAR_NODE_FILE}") or die "can't open ENV{OAR_NODE_FILE}: $!";
-        $task++ while <NODE_FILE>;
-        close NODE_FILE;
-}
+   open(NODE_FILE, '<', "$ENV{OAR_NODE_FILE}") or die "can't open ENV{OAR_NODE_FILE}: $!";
+   $task++ while <NODE_FILE>;
+   close NODE_FILE;
+   }
 
+# job to run
 my @job = ();
 open (JOB_LIST, '<', "$file") or die "can't open $file: $!";
 while (<JOB_LIST>) {
-        chomp;
-        next if m/^#/;
-        push @job, $_ if m/^\s*oarsub/;
-}
+   chomp;
+   next if m/^#/;
+   push @job, $_ if m/^\s*oarsub/;
+   }
 close JOB_LIST;
 
@@ -46 +48 @@
 # interactive job
 if (not $container_id > 1) {
-        $insert_oar_option = '';
-        $overload = 1;
-}
+   $insert_oar_option = '';
+   $overload = 1;
+   }
 
 
@@ -58 +60 @@
 my %scheduled = ();
 
+# asynchrone start job block
 async {
-        for my $job (@job) {
-                while ($job_active->count >= $task*$overload) {
-                        cede;
-                }
-                $job =~ s/^\s*oarsub//;
-                print "oarsub $insert_oar_option $job" if $verbose;
-                my $job_id = `oarsub $insert_oar_option $job|grep ^OAR_JOB_ID|cut -f 2 -d '='`;
-                chomp $job_id;
-                if ($job_id > 1) {
-                        $scheduled{$job_id}++;
-                        $job_active->up;
-                }
-                cede;
-        }
-}
+   JOB:
+   for my $job (@job) {
+      while ($job_active->count >= $task*$overload) {
+         cede;
+         }
+      $job =~ s/^\s*oarsub//;
+      print "oarsub $insert_oar_option $job" if $verbose;
+      my $job_id = `oarsub $insert_oar_option $job|grep ^OAR_JOB_ID|cut -f 2 -d '='`;
+      chomp $job_id;
+      if ($job_id > 1) {
+         $scheduled{$job_id}++;
+         $job_active->up;
+         }
+      cede;
+      }
+   }
 
 async {
-        while () {
-                for my $job_id (keys %scheduled) {
-                        my $is_finish = `oarstat -s -j $job_id`;
-                        chomp $is_finish;
-                        if ($is_finish =~ m/Terminated/) {
-                                delete $scheduled{$job_id};
-                                $job_active->down;
-                                $job_todo->down;
-                        }
-                        cede;
-                }
+   while () {
+      for my $job_id (keys %scheduled) {
+         my $is_finish = `oarstat -s -j $job_id`;
+         chomp $is_finish;
+         if ($is_finish =~ m/Terminated/) {
+            delete $scheduled{$job_id};
+            $job_active->down;
+            $job_todo->down;
+            }
+         cede;
+         }
 
-                $finished->send if $job_todo->count == 0;
-                cede;
-        }
-}
+      $finished->send if $job_todo->count == 0;
+      cede;
+      }
+   }
 
 cede;
    
+# all job have been done
 $finished->wait;