Changeset 2491 in ProjectBuilder

Timestamp:

Mar 31, 2020, 11:26:06 AM (5 years ago)

Author:

Bruno Cornec

Message:

Various perf improvements

• Avoid managing full changelog files when in testver
• Avoid loading a conf file in cache already handled
• set_waitpid_blocking_sleep(0)
• Use YAML::XS if available

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (4 diffs)
• pb/bin/pb (modified) (6 diffs)
• pb/lib/ProjectBuilder/Changelog.pm (modified) (1 diff)
• pb/lib/ProjectBuilder/Filter.pm (modified) (2 diffs)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -210 +210 @@
 } else {
     eval {
-        require YAML;
-        YAML->import();
+        require YAML::XS;
+        YAML::XS->import();
     };
     if ($@) {
         eval {
-            # No YAML found using a more std but less complete one. Old perl only
-            require Module::Build::YAML;
-            Module::Build::YAML->import();
+            require YAML;
+            YAML->import();
         };
         if ($@) {
             eval {
                 # No YAML found using a more std but less complete one. Old perl only
-                require YAML::Tiny;
-                YAML::Tiny->import();
+                require Module::Build::YAML;
+                Module::Build::YAML->import();
             };
             if ($@) {
                 eval {
-                    # No YAML found using an embedded pne
-                    require ProjectBuilder::YAML;
-                    ProjectBuilder::YAML->import();
+                    # No YAML found using a more std but less complete one. Old perl only
+                    require YAML::Tiny;
+                    YAML::Tiny->import();
                 };
                 if ($@) {
-                    # Here we should be in the setup phase, with an embedded YAML code
-                    $ldfunc = \&LoadFile;
-                    #die "Unable to handle YAML configuration files without a YAML.pm module\n";
+                    eval {
+                        # No YAML found using an embedded pne
+                        require ProjectBuilder::YAML;
+                        ProjectBuilder::YAML->import();
+                    };
+                    if ($@) {
+                        # Here we should be in the setup phase, with an embedded YAML code
+                        $ldfunc = \&LoadFile;
+                        #die "Unable to handle YAML configuration files without a YAML.pm module\n";
+                    } else {
+                        $ldfunc = \&ProjectBuilder::YAML::LoadFile;
+                    }
                 } else {
-                    $ldfunc = \&ProjectBuilder::YAML::LoadFile;
+                    $ldfunc = \&YAML::Tiny::LoadFile;
                 }
             } else {
-                $ldfunc = \&YAML::Tiny::LoadFile;
+                $ldfunc = \&Module::Build::YAML::LoadFile;
             }
         } else {
-            $ldfunc = \&Module::Build::YAML::LoadFile;
-        }
+            $ldfunc = \&YAML::LoadFile;
     } else {
-        $ldfunc = \&YAML::LoadFile;
-    }
+        $ldfunc = \&YAML::XS::LoadFile;
+    }
+
+    # Have we already handled that conf file ?
+    next if ($lh->{'__cf'}->{$cf} eq 1);
 
     pb_log(1,"Loading YAML conf file $cf\n");
@@ -265 +275 @@
         }
     }
+    # Remember we've seen that conf file
+    $lh->{'__cf'}->{$cf} = 1;
 }
 return($lh);
@@ -277 +289 @@
 sub pb_conf_add {
 
-pb_log(2,"DEBUG: pb_conf_add with ".Dumper(@_)."\n");
 my $lh;
 
@@ -288 +299 @@
     return($lh) if (defined $pbconffiles{$cf});
     
+    pb_log(2,"DEBUG: pb_conf_add with $cf\n");
     # The new conf file overload values already managed
     my $num = keys %pbconffiles;

devel/pb/bin/pb

@@ -1318 +1318 @@
             # Try to use // processing here
             my $all_ok = 1;
-            my $pm = new Parallel::ForkManager($pbparallel) if (defined $pbparallel);
-            $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
-                                    $all_ok = 0 unless (($code == 0) && ($signal == 0) && ($dump == 0)); }) if (defined $pbparallel);
+            my $pm;
+            if (defined $pbparallel) {
+                $pm = new Parallel::ForkManager($pbparallel);
+                $pm->set_waitpid_blocking_sleep(0);
+                $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
+                                    $all_ok = 0 unless (($code == 0) && ($signal == 0) && ($dump == 0)); });
+            }
 
             pb_log(0,"Preparing delivery ...\n");
@@ -1736 +1740 @@
     if (defined $pbparallel) {
         $pm = new Parallel::ForkManager($pbparallel);
+        $pm->set_waitpid_blocking_sleep(0);
         $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;
                                 $all_ok = 0 unless (($code == 0) && ($signal == 0) && ($dump == 0)); });
@@ -3117 +3122 @@
 if (defined $pbparallel) {
     $pm = new Parallel::ForkManager($pbparallel);
+    $pm->set_waitpid_blocking_sleep(0);
 
     # Set which port the VM/RM will use to communicate
@@ -3475 +3481 @@
 if (defined $pbparallel) {
     $pm = new Parallel::ForkManager($pbparallel);
+    $pm->set_waitpid_blocking_sleep(0);
 
     # Set which port the VM/RM will use to communicate
@@ -3812 +3819 @@
 if (defined $pbparallel) {
     $pm = new Parallel::ForkManager($pbparallel);
+    $pm->set_waitpid_blocking_sleep(0);
 
     # Set which port the VM/RM will use to communicate
@@ -4403 +4411 @@
 if (defined $pbparallel) {
     $pm = new Parallel::ForkManager($pbparallel);
+    $pm->set_waitpid_blocking_sleep(0);
 
     $pm->run_on_finish(sub { my ($pid, $code, $id, $signal, $dump) = @_;

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -104 +104 @@
 my @date = pb_get_date();
 # If we don't need to do it, or don't have it fake something
-if (((not defined $chglog) || (! -f $chglog)) && ($doit ne "yes")) {
+if (((not defined $chglog) || (! -f $chglog)) || ($doit ne "yes")) {
     pb_log(2,"No ChangeLog file for $pbrealpkg - faking one\n");
     $date = strftime("%Y-%m-%d", @date);

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -118 +118 @@
             local $_ = $ptr->{$in_key} || '';
             eval $expr;
-            die "Error evaluating tranform for $out_key ($expr): $@" if $@;
+            die "Error evaluating transform for $out_key ($expr): $@" if $@;
             $ptr->{$out_key} = $_;
             pb_log(2, "Transform $in_key to $out_key\n$ptr->{$in_key}\n$ptr->{$out_key}\n");
@@ -186 +186 @@
             # special case for ChangeLog only for pb
             pb_log(3,"DEBUG filtering PBLOG\n");
+            my ($testver) = pb_conf_get_if("testver");
+            $tmp = "no" if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i));
             pb_changelog($pb, \*DEST, $tmp);
             $tmp = "";