Changeset 1126 in ProjectBuilder

Timestamp:

Dec 13, 2010, 2:53:10 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Use potentially Sys::CPU if present to determine number of cores (1 by default)
• Adds a conf param to force number of cores (pbparallel)
• Adds doc for pbparallel, oscmd, oscmdopt

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (2 diffs)
• pb/bin/pb (modified) (2 diffs)

devel/pb-modules/etc/pb.conf

@@ -445 +445 @@
 oscmd rpmbootstrap = rpm,rpm2cpio,wget
 #oscmdopt rpmbootstrap = 
+
+# Number of process in // for pb
+#pbparallel pb = 2
+
 #
 # Commands to check packages

devel/pb-modules/etc/pb.conf.pod

@@ -86 +86 @@
  Conffile: pb
  Example: oschkcmd rpm = -i
+
+=item B<oscmd>
+
+ Nature: Mandatory
+ Key: tool (pb or rpmbootstrap)
+ Value: come separated list of commands that are mandatory on the underlying system
+ Conffile: pb
+ Example: oscmd pb = tar,ls
+
+=item B<oscmdopt>
+
+ Nature: Mandatory
+ Key: tool (pb or rpmbootstrap)
+ Value: come separated list of commands that are optional on the underlying system
+ Conffile: pb
+ Example: oscmd pb = svn2cl,svn,cvs
 
 =item B<oscodename>
@@ -246 +262 @@
  Conffile: project
  Example: pbpackager pb = Bruno Cornec <bruno@project-builder.org>
+
+=item B<pbparallel>
+
+ Nature: Optional
+ Key: tool (pb or rpmbootstrap)
+ Value: number of processes to execute in parallel. By default use the number of cores.
+ Conffile: pb
+ Example: pbparallel pb = 12
 
 =item B<pbpkg>

devel/pb/bin/pb

@@ -498 +498 @@
 # Check for command requirements
 #
-my ($req,$opt) = pb_conf_get_if("oscmd","oscmdopt");
+my ($req,$opt,$pbpara) = pb_conf_get_if("oscmd","oscmdopt","pbparallel");
 my ($req2,$opt2) = (undef,undef);
 $req2 = $req->{$appname} if (defined $req);
@@ -507 +507 @@
 # Check if we can launch some actions in // with Parallel::ForkManager
 #
-my $pbparallel = 12;
+my $pbparallel = $pbpara->{$appname} if (defined $pbpara);
+if (not defined $pbparallel) {
+    eval
+    {
+        require Sys::CPU;
+        Sys::CPU->import();
+    };
+    if ($@) {
+        # Sys::CPU not found, defaulting to 1
+        $pbparallel = 1;
+    } else {
+        # Using the number of cores
+        $pbparallel = Sys::CPU::cpu_count();
+    }
+}
+
 eval
 {