Changeset 898

Timestamp:

11/10/09 03:31:28 (4 years ago)

Author:

bruno

Message:

• Do not add conf files if already present in the list (changing pbconffiles into a hash for that to still keep order as this is mandatory)
• Small optimisations for pb_conf function usage in pb

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Conf.pm (modified) (6 diffs)
• pb/bin/pb (modified) (10 diffs)

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

@@ -24 +24 @@
 our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if);
 
-# Global list of conf files
-my @pbconffiles = ();
+# Global hash of conf files
+# Key is the conf file name
+# Value is its rank
+my %pbconffiles;
+
+# Global hash of cached values. 
+# We consider that values can not change during the life of pb
+# my %cachedval;
 
 =pod
@@ -53 +59 @@
 =item B<pb_conf_init>
 
-This function setup the environment PBPROJ for project-builder function usage rfom other projects.
+This function setup the environment PBPROJ for project-builder function usage from other projects.
 The first parameter is the project name.
-It sets up environement variables (PBPROJ) 
+It sets up environment variables (PBPROJ) 
 
 =cut
@@ -81 +87 @@
 
 pb_log(2,"DEBUG: pb_conf_add with ".Dumper(@_)."\n");
-push(@pbconffiles,@_);
+
+foreach my $cf (@_) {
+    # Skip already used conf files
+    next if (defined $pbconffiles{$cf});
+    # Add the new one at the end
+    my $num = keys %pbconffiles;
+    $pbconffiles{$cf} = $num;
+}
 }
 
@@ -191 +204 @@
 my $ptr = undef;
 
-# the most important conf file is first, so read them in revers order
-foreach my $f (reverse @pbconffiles) {
+# the most important conf file is first, so read them in reverse order
+foreach my $f (reverse sort { $pbconffiles{$a} <=> $pbconffiles{$b} } keys %pbconffiles) {
     $ptr = pb_conf_get_fromfile_if("$f",$ptr,@param);
 }
@@ -234 +247 @@
 foreach my $i (0..$#param) {
     $p1 = $ptr1[$i];
+    # Optimisation doesn't seem useful
+    # if ((defined $p1) && (defined $cachedval{$p1})) {
+    # $ptr1[$i] = $cachedval{$p1};
+    # next;
+    # }
     $p2 = $ptr2[$i];
     # Always try to take the param from ptr1 
@@ -271 +289 @@
     }
     $ptr1[$i] = $p1;
+    # Cache values to avoid redoing all that analyze when asked again on a known value
+    # $cachedval{$p1} = $p1;
 }
 pb_log(2,"DEBUG: pb_conf_get output: ".Dumper(@ptr1)."\n");

devel/pb/bin/pb

@@ -528 +528 @@
     my ($scheme, $uri) = pb_cms_init($pbinit);
 
-    my ($pkgv, $pkgt) = pb_conf_get_if("pkgver","pkgtag");
+    # We need 2 lines here
+    my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
+    my @pt = pb_conf_get_if("vmlist","velist");
 
     # declare packager and repo for filtering
@@ -536 +538 @@
 
     foreach my $pbpkg (@pkgs) {
-        my ($testver) = pb_conf_get_if("testver");
         $ENV{'PBPKG'} = $pbpkg;
 
@@ -596 +597 @@
 
         my %build;
-        my @pt;
         # We want to at least build for the underlying distro
         my ($ddir, $dver, $dfam, $dtype, $pbsuf, $pbupd, $arch) = pb_distro_init();
@@ -603 +603 @@
 
         # Get list of distributions for which I need to generate build files
-        @pt = pb_conf_get_if("vmlist","velist");
         if (defined $pt[0]->{$ENV{'PBPROJ'}}) {
             $tmpl .= $pt[0]->{$ENV{'PBPROJ'}};
@@ -632 +631 @@
         # Do not do that for website
         if ((not defined $param) || ($param ne "Web")) {
+            pb_log(0,"Build files are being generated for ...\n");
             my %virt;
             # De-duplicate similar VM and VE 
@@ -731 +731 @@
                 push @notfound,$b if ($build{$b} =~ /no/);
             }
-            pb_log(0,"Build files generated for ".join(',',sort(@found))."\n");
+            pb_log(0," ... ".join(',',sort(@found))."\n");
             pb_log(0,"No Build files found for ".join(',',sort(@notfound))."\n") if (@notfound);
             pb_log(2,"DEBUG: patches: ".Dumper(%patches)."\n");
@@ -876 +876 @@
 
     # Get list of packages to build
-    # Get content saved in cms2build
     my $ptr = pb_get_pkg();
     @pkgs = @$ptr;
 
+    # Get content saved in cms2build
     my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb","pbpkg");
     $pkg = { } if (not defined $pkg);
@@ -1174 +1174 @@
 
     if ($cmt ne "Announce") {
+        # Get list of packages to build
         my $ptr = pb_get_pkg();
         @pkgs = @$ptr;
@@ -1979 +1980 @@
     my ($scheme2,$uri) = pb_cms_init($pbinit);
 
-    my ($pbconf) = pb_conf_get("pbconfurl");
+    my ($pbconf,$pburl) = pb_conf_get("pbconfurl","pburl");
     $uri = $pbconf->{$ENV{'PBPROJ'}};
     my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
 
     # Checking CMS repositories status
-    my ($pburl) = pb_conf_get("pburl");
     ($scheme2, $account, $host, $port, $path) = pb_get_uri($pburl->{$ENV{'PBPROJ'}});
 
@@ -2460 +2460 @@
 my $pbscript = "$ENV{'PBDESTDIR'}/snapv";
 
+my ($pbac) = pb_conf_get($vtype."login");
+
 foreach my $v (@$vm) {
     # Name of the account to deal with for VM/VE
     # Do not use the one passed potentially with -a
-    my ($pbac) = pb_conf_get($vtype."login");
     my ($vmexist,$vmpid);