Changeset 1146 in ProjectBuilder

Timestamp:

Jan 10, 2011, 2:51:59 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix call on run_on_start which needs a pointer on fct.

File:

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

devel/pb/bin/pb

@@ -2233 +2233 @@
 
 # Set which port the VM will use to communicate
-$pm->run_on_start(pb_set_port());
+$pm->run_on_start(\&pb_set_port);
 
 my $counter = 0;
@@ -2518 +2518 @@
 
 # Set which port the VM will use to communicate
-$pm->run_on_start(pb_set_port());
+$pm->run_on_start(\&pb_set_port);
 
 my $counter = 0;
@@ -3465 +3465 @@
 
 die "No port passed in parameter. Report to dev team\n" if (not defined $port);
+pb_log(2,"pb_get_port with $port\n");
 my $nport = $port;
 # Maybe a port was given as parameter so overwrite
@@ -3472 +3473 @@
     $nport += $ENV{'PBVMPORT'} if ((defined $pbparallel) && (defined $ENV{'PBVMPORT'}));
 }
+pb_log(2,"pb_get_port returns $nport\n");
 return($nport);
 }
@@ -3478 +3480 @@
         
 my ($pid,$ident) = @_;
+pb_log(2,"pb_set_port for VM ($pid), id $ident\n");
 $ENV{'PBVMPORT'} = $ident;
+pb_log(2,"pb_set_port sets PBVMPORT in env to $ENV{'PBVMPORT'}\n");
 }
 
@@ -3485 +3489 @@
 my $vtype = shift;
 
-my ($pbvmmem) = pb_conf_get_if("pbvmmem");
-
+pb_log(2,"pb_set_parallel vtype: $vtype\n");
 # Take care of memory size if VM, parallel mode and more than 1 action
 if ((defined $pbparallel) && ($pbparallel ne 1) && ($vtype eq "vm")) {
@@ -3506 +3509 @@
             my $ram = $si->{"totalram"}-$si->{"sharedram"}-$si->{"bufferram"};
             my $ram2;
+            my ($pbvmmem) = pb_conf_get_if("pbvmmem");
+
             if ((defined $pbvmmem) and (defined $pbvmmem->{$ENV{'PBPROJ'}})) {
                 $ram2 = $pbvmmem->{$ENV{'PBPROJ'}};
@@ -3516 +3521 @@
     }
 }
+pb_log(2,"pb_set_parallel returns: $pbparallel\n");
 return($pbparallel);
 }