Changeset 13811

Timestamp:

01/24/12 09:31:40 (4 weeks ago)

Author:

OlivierRaginel

Message:

Item11458: Try to optimise filesystem accesses by minimizing stat() calls. Also Sven, 3 arguments open!!!

Location:

trunk/core/lib/Foswiki

Files:

• Templates.pm (modified) (3 diffs)
• Users/ApacheHtpasswdUser.pm (modified) (1 diff)
• Users/HtPasswdUser.pm (modified) (2 diffs)

trunk/core/lib/Foswiki/Templates.pm

@@ -612 +612 @@
         $tmpl_cachedir . '/' . $name . '__' . $skins . '__' . $web . '.tmpl' );
 
-    unless ( open( FILE, ">$filename" ) ) {
+    unless ( open( my $file, '>', $filename ) ) {
         die "Can't create file $filename - $!\n" if DEBUG;
         print STDERR "Can't create file $filename - $!\n";
@@ -618 +618 @@
         return;
     }
-    print FILE $tmplText;
-    close(FILE);
+    print $file $tmplText;
+    close($file);
 }
 
@@ -634 +634 @@
 
     if ( -e $filename ) {
-        open( IN_FILE, "<$filename" ) || return;
+        open( my $in_file, '<', $filename ) or return;
         local $/ = undef;    # set to read to EOF
-        my $data = <IN_FILE>;
-        close(IN_FILE);
+        my $data = <$in_file>;
+        close($in_file);
         return $data;
     }

trunk/core/lib/Foswiki/Users/ApacheHtpasswdUser.pm

@@ -122 +122 @@
 
     # We expect the path to exist and be writable.
-    return 0 if ( -e $path && -f $path && -w $path );
+    return 0 if ( -e $path && -f _ && -w _ );
 
     # Otherwise, log a problem.

trunk/core/lib/Foswiki/Users/HtPasswdUser.pm

@@ -163 +163 @@
 
     # We expect the path to exist and be writable.
-    return 0 if ( -e $path && -f $path && -w $path );
+    return 0 if ( -e $path && -f _ && -w _ );
 
     # Otherwise, log a problem.
@@ -228 +228 @@
         && -e $Foswiki::cfg{Htpasswd}{FileName} )
     {
-        my $fileTime = ( stat( $Foswiki::cfg{Htpasswd}{FileName} ) )[9];
+        my $fileTime = ( stat(_) )[9];
         $this->ClearCache()
           if ( $fileTime > $this->PasswordTimestamp() );