X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d3d399941061d95cd4aae6ae2cf7594a4e5e7452..9b20e0a24ef0bba1a04eb5d29a5a855f242cd933:/IkiWiki/Wrapper.pm?ds=sidebyside

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 99237d3b5..7a2d4381a 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -44,6 +44,7 @@ EOF
 	}
 
 	my $check_commit_hook="";
+	my $pre_exec="";
 	if ($config{post_commit}) {
 		# Optimise checking !commit_hook_enabled() , 
 		# so that ikiwiki does not have to be started if the
@@ -58,7 +59,7 @@ EOF
 		# the benefit of this optimisation.
 		$check_commit_hook=<<"EOF";
 	{
-		int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR);
+		int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR, 0666);
 		if (fd != -1) {
 			if (flock(fd, LOCK_SH | LOCK_NB) != 0)
 				exit(0);
@@ -67,6 +68,19 @@ EOF
 	}
 EOF
 	}
+	elsif ($config{cgi}) {
+		# Avoid more than one ikiwiki cgi running at a time by
+		# taking a cgi lock. Since ikiwiki uses several MB of
+		# memory, a pile up of processes could cause thrashing
+		# otherwise.
+		$pre_exec=<<"EOF";
+	{
+		int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
+		if (fd != -1)
+			flock(fd, LOCK_EX);
+	}
+EOF
+	}
 
 	$Data::Dumper::Indent=0; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
@@ -122,6 +136,7 @@ $envsave
 		exit(1);
 	}
 
+$pre_exec
 	execl("$this", "$this", NULL);
 	perror("exec $this");
 	exit(1);