Changeset 1139

Timestamp:

01/07/11 02:51:40 (2 years ago)

Author:

bruno

Message:

• Parallelize pb_build2v
• Need to work on compatibility issues of pb in VE and outside, now again incompatible.

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -1774 +1774 @@
         pb_rm_rf("$ENV{'PBBUILDDIR'}/$odir");
     }
+    unlink("$ENV{'PBDESTDIR'}/pbscript.$$") if ($cmt =~ /^V[ME]/);
+
     pb_log(2,"Before halt, vmexist: $vmexist, vmpid: $vmpid\n");
     if ((! $vmexist) && ($cmt =~ /^VM/)) {
@@ -2196 +2198 @@
 
 my ($vmexist,$vmpid) = (undef,undef);
+my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
 
 foreach my $v (@$v) {
+    $pm->start and next if (defined $pbparallel);
     # Prepare the script to be executed on the VM/VE
     # in $ENV{'PBDESTDIR'}/pbscript.$$
@@ -2298 +2302 @@
     ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
 
+
     if ($vtype eq "vm") {
         # Skip that VM if it something went wrong
-        next if (($vmpid == 0) && ($vmexist == 0));
+        if (($vmpid == 0) && ($vmexist == 0)) {
+            $pm->finish if (defined $pbparallel);
+            next;
+        }
     } else {
         # VE
@@ -2310 +2318 @@
     pb_log(2,"Calling send2target $vtype,$v,$vmexist,$vmpid\n");
     pb_send2target(uc($vtype).$action,"$v",$vmexist,$vmpid);
+    $pm->finish if (defined $pbparallel);
+}
+if (defined $pbparallel) {
+    $pm->wait_all_children;
 }
 }