Changeset 773 in ProjectBuilder

Timestamp:

May 3, 2009, 8:52:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Fixes for test2v mode (src copied)
• Add notion of usesnap to try solving VM snapshot usage

File:

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

devel/pb/bin/pb

@@ -1145 +1145 @@
         $src="$src $ENV{'PBDESTDIR'}/pbscript";
     } elsif ($cmt =~ /V[EM]test/) {
-        $src="$src $ENV{'PBDESTDIR'}/pbtest";
+        $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript $ENV{'PBDESTDIR'}/pbtest";
     } elsif ($cmt eq "Announce") {
         $src="$src $ENV{'PBTMP'}/pbscript";
@@ -1354 +1354 @@
         close(PASS);
         $cptarget = "$tpdir/$homedir/$tdir";
-        if ($cmt eq "ve") {
+        if ($cmt eq "VEbuild") {
             $cp2target = "$tpdir/$homedir/$bdir";
         }
@@ -1468 +1468 @@
 
     foreach my $v (@$vm) {
-        # Launch VM/VE
-        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme);
+        # Launch VM/VE - Usage of snapshot disabled
+        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme,0);
 
         if ($vtype eq "vm") {
@@ -1501 +1501 @@
     my $create = shift || 0;        # By default do not create a VM/VE
     my $snapme = shift || 0;        # By default do not snap a VM/VE
-
-    pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create,$snapme)\n");
+    my $usesnap = shift || 1;       # By default study the usage of the snapshot feature of VM/VE
+
+    # If creation or snapshot creation mode, no snapshot usable
+    if (($create == 1) || ($snapme == 1)) {
+        $usesnap = 0;
+    }
+
+    pb_log(2,"DEBUG: pb_launchv($vtype,$v,$create,$snapme,$usesnap)\n");
     die "No VM/VE defined, unable to launch" if (not defined $v);
     # Keep only the first VM in case many were given
@@ -1531 +1537 @@
             $ENV{'PBVMOPT'} .= " $vmopt->{$ENV{'PBPROJ'}}" if ($ENV{'PBVMOPT'} !~ / $vmopt->{$ENV{'PBPROJ'}}/);
         }
-        # Use snapshot feature when not creating VM
-        if ($create == 0) {
+
+        # Are we allowed to use snapshot feature 
+        if ($usesnap == 1) {
             if ((defined $vmsnap->{$v}) && ($vmsnap->{$v} =~ /true/i)) {
                 $ENV{'PBVMOPT'} .= "-snapshot ";
@@ -1545 +1552 @@
                 # Configure the monitoring to automize the creation of the 'pb' snapshot
                 $ENV{'PBVMOPT'} .= "-serial mon:telnet::$vmmonport->{$ENV{'PBPROJ'}},server,nowait ";
-                # In that case no snapshot needed
+                # In that case no snapshot call needed
                 $ENV{'PBVMOPT'} =~ s/-snapshot //;
             }
@@ -2048 +2055 @@
 EOF
 
-    # Launch the VM/VE
-    ($vmexist,$vmpid) = pb_launchv($vtype,$v,0);
+    # Launch the VM/VE - Usage of snapshot disabled
+    ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,0,0);
 
     if ($vtype eq "vm") {
@@ -2338 +2345 @@
 
     # Force shutdown of VM/VE
-    $pbforce = 1;
     # Force snapshot of VM/VE
-    pb_script2v($pbscript,$vtype,$pbforce,$v,1);
+    pb_script2v($pbscript,$vtype,1,$v,1);
 }
 return;