This isn't a huge change, it just adds global variables for the file handles,
an additional cleanup to localize the variable a bit more which should alleviate
the issues that Jakub had with my original approach.
Signed-off-by: John 'Warthog9' Hawley <warthog9@xxxxxxxxxxxxxx>
---
gitweb/lib/cache.pl | 114 +++++++++++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 43 deletions(-)
diff --git a/gitweb/lib/cache.pl b/gitweb/lib/cache.pl
index 5182a94..fafc028 100644
--- a/gitweb/lib/cache.pl
+++ b/gitweb/lib/cache.pl
@@ -14,6 +14,12 @@ use Digest::MD5 qw(md5 md5_hex md5_base64);
use Fcntl ':flock';
use File::Copy;
+# Global declarations
+our $cacheFile;
+our $cacheFileBG;
+our $cacheFileBinWT;
+our $cacheFileBin;
+
sub cache_fetch {
my ($action) = @_;
my $cacheTime = 0;
@@ -49,9 +55,9 @@ sub cache_fetch {
}else{
#if cache is out dated, update
#else displayCache();
- open(cacheFile, '<', "$fullhashpath");
- stat(cacheFile);
- close(cacheFile);
+ open($cacheFile, '<', "$fullhashpath");
+ stat($cacheFile);
+ close($cacheFile);
my $stat_time = (stat(_))[9];
my $stat_size = (stat(_))[7];
@@ -150,13 +156,13 @@ sub cacheUpdate {
my $fileData = "";
if($backgroundCache){
- open(cacheFileBG, '>:utf8', "$fullhashpath.bg");
- my $lockStatBG = flock(cacheFileBG,LOCK_EX|LOCK_NB);
+ open($cacheFileBG, '>:utf8', "$fullhashpath.bg");
+ my $lockStatBG = flock($cacheFileBG,LOCK_EX|LOCK_NB);
$lockStatus = $lockStatBG;
}else{
- open(cacheFile, '>:utf8', \$fullhashpath);
- my $lockStat = flock(cacheFile,LOCK_EX|LOCK_NB);
+ open($cacheFile, '>:utf8', \$fullhashpath);
+ my $lockStat = flock($cacheFile,LOCK_EX|LOCK_NB);
$lockStatus = $lockStat;
}
@@ -172,8 +178,8 @@ sub cacheUpdate {
}
if( isBinaryAction($action) ){
- my $openstat = open(cacheFileBinWT, '>>:utf8', "$fullhashbinpath");
- my $lockStatBin = flock(cacheFileBinWT,LOCK_EX|LOCK_NB);
+ my $openstat = open($cacheFileBinWT, '>>:utf8', "$fullhashbinpath");
+ my $lockStatBin = flock($cacheFileBinWT,LOCK_EX|LOCK_NB);
}
# Trap all output from the action
@@ -186,8 +192,8 @@ sub cacheUpdate {
if($backgroundCache){
- open(cacheFile, '>:utf8', "$fullhashpath");
- $lockStat = flock(cacheFile,LOCK_EX);
+ open($cacheFile, '>:utf8', "$fullhashpath");
+ $lockStat = flock($cacheFile,LOCK_EX);
if (! $lockStat ){
if ( $areForked ){
@@ -199,8 +205,8 @@ sub cacheUpdate {
}
if( isBinaryAction($action) ){
- my $openstat = open(cacheFileBinFINAL, '>:utf8', "$fullhashbinpathfinal");
- $lockStatBIN = flock(cacheFileBinFINAL,LOCK_EX);
+ my $openstat = open($cacheFileBinFINAL, '>:utf8', "$fullhashbinpathfinal");
+ $lockStatBIN = flock($cacheFileBinFINAL,LOCK_EX);
if (! $lockStatBIN ){
if ( $areForked ){
@@ -214,24 +220,24 @@ sub cacheUpdate {
# Actually dump the output to the proper file handler
local $/ = undef;
$|++;
- print cacheFile "$output";
+ print $cacheFile "$output";
$|--;
if( isBinaryAction($action) ){
move("$fullhashbinpath", "$fullhashbinpathfinal") or die "Binary Cache file could not be updated: $!";
- flock(cacheFileBinFINAL,LOCK_UN);
- close(cacheFileBinFINAL);
+ flock($cacheFileBinFINAL,LOCK_UN);
+ close($cacheFileBinFINAL);
- flock(cacheFileBinWT,LOCK_UN);
- close(cacheFileBinWT);
+ flock($cacheFileBinWT,LOCK_UN);
+ close($cacheFileBinWT);
}
- flock(cacheFile,LOCK_UN);
- close(cacheFile);
+ flock($cacheFile,LOCK_UN);
+ close($cacheFile);
if($backgroundCache){
- flock(cacheFileBG,LOCK_UN);
- close(cacheFileBG);
+ flock($cacheFileBG,LOCK_UN);
+ close($cacheFileBG);
}
if ( $areForked ){
@@ -250,10 +256,10 @@ sub cacheWaitForUpdate {
if( $backgroundCache ){
if( -e "$fullhashpath" ){
- open(cacheFile, '<:utf8', "$fullhashpath");
- $lockStat = flock(cacheFile,LOCK_SH|LOCK_NB);
- stat(cacheFile);
- close(cacheFile);
+ open($cacheFile, '<:utf8', "$fullhashpath");
+ $lockStat = flock($cacheFile,LOCK_SH|LOCK_NB);
+ stat($cacheFile);
+ close($cacheFile);
if( $lockStat && ( (stat(_))[9] > (time - $maxCacheLife) ) ){
cacheDisplay($action);
@@ -271,9 +277,9 @@ sub cacheWaitForUpdate {
){
do {
sleep 2 if $x > 0;
- open(cacheFile, '<:utf8', "$fullhashpath");
- $lockStat = flock(cacheFile,LOCK_SH|LOCK_NB);
- close(cacheFile);
+ open($cacheFile, '<:utf8', "$fullhashpath");
+ $lockStat = flock($cacheFile,LOCK_SH|LOCK_NB);
+ close($cacheFile);
$x++;
$combinedLockStat = $lockStat;
} while ((! $combinedLockStat) && ($x < $max));
@@ -326,9 +332,9 @@ EOF
do {
print ".";
sleep 2 if $x > 0;
- open(cacheFile, '<:utf8', "$fullhashpath");
- $lockStat = flock(cacheFile,LOCK_SH|LOCK_NB);
- close(cacheFile);
+ open($cacheFile, '<:utf8', "$fullhashpath");
+ $lockStat = flock($cacheFile,LOCK_SH|LOCK_NB);
+ close($cacheFile);
$x++;
$combinedLockStat = $lockStat;
} while ((! $combinedLockStat) && ($x < $max));
@@ -339,41 +345,63 @@ EOF
return;
}
+sub cacheDisplayErr {
+
+ return if ( ! -e "$fullhashpath.err" );
+
+ open($cacheFileErr, '<:utf8', "$fullhashpath.err");
+ $lockStatus = flock($cacheFileErr,LOCK_SH|LOCK_NB);
+
+ if (! $lockStatus ){
+ show_warning(
+ "<p>".
+ "<strong>*** Warning ***:</strong> Locking error when trying to lock error cache page, file $fullhashpath.err<br/>/\n".
+ "This is about as screwed up as it gets folks - see your systems administrator for more help with this.".
+ "<p>"
+ );
+ }
+
+ while( <$cacheFileErr> ){
+ print $_;
+ }
+ exit(0);
+}
+
sub cacheDisplay {
local $/ = undef;
$|++;
my ($action) = @_;
- open(cacheFile, '<:utf8', "$fullhashpath");
- $lockStat = flock(cacheFile,LOCK_SH|LOCK_NB);
+ open($cacheFile, '<:utf8', "$fullhashpath");
+ $lockStat = flock($cacheFile,LOCK_SH|LOCK_NB);
if (! $lockStat ){
- close(cacheFile);
+ close($cacheFile);
cacheWaitForUpdate($action);
}
if( isBinaryAction($action) ){
- my $openstat = open(cacheFileBin, '<', "$fullhashbinpathfinal");
- $lockStatBIN = flock(cacheFileBin,LOCK_SH|LOCK_NB);
+ my $openstat = open($cacheFileBin, '<', "$fullhashbinpathfinal");
+ $lockStatBIN = flock($cacheFileBin,LOCK_SH|LOCK_NB);
if (! $lockStatBIN ){
- close(cacheFile);
- close(cacheFileBin);
+ close($cacheFile);
+ close($cacheFileBin);
cacheWaitForUpdate($action);
}
my $binfilesize = -s "$fullhashbinpathfinal";
print "Content-Length: $binfilesize";
}
- while( <cacheFile> ){
+ while( <$cacheFile> ){
print $_;
}
if( isBinaryAction($action) ){
binmode STDOUT, ':raw';
- print <cacheFileBin>;
+ print <$cacheFileBin>;
binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
- close(cacheFileBin);
+ close($cacheFileBin);
}
- close(cacheFile);
+ close($cacheFile);
$|--;
}
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html