Changeset 898 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/Conf.pm

Timestamp:

Nov 10, 2009, 3:31:28 AM (14 years ago)

Author:

Bruno Cornec

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

File:

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