Changeset 2491 in ProjectBuilder for devel/pb-modules

Timestamp:

Mar 31, 2020, 11:26:06 AM (4 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

File:

• devel/pb-modules/lib/ProjectBuilder/Conf.pm (modified) (4 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;