Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index fd8a0e5b0e03d3f4f1a907fdb0b25d6fb68033ae..31e30ad2ebb3cd2e8da33996a2e3b8cbcf890da9 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -31,7 +31,7 @@ sub gen_wrapper () { #{{{
                       HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {
                       HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {

-               $envsave.=<<"EOF"
+               $envsave.=<<"EOF";

        if ((s=getenv("$var")))
                addenv("$var", s);
 EOF
        if ((s=getenv("$var")))
                addenv("$var", s);
 EOF


@@ -43,6 +43,49 @@ EOF
                $test_receive=IkiWiki::Receive::gen_wrapper();
        }
 
                $test_receive=IkiWiki::Receive::gen_wrapper();
        }
 

+       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
+               # hook is disabled.
+               #
+               # Note that perl's flock may be implemented using fcntl
+               # or lockf on some systems. If so, and if there is no
+               # interop between the locking systems, the true C flock will
+               # always succeed, and this optimisation won't work.
+               # The perl code will later correctly check the lock,
+               # so the right thing will still happen, though without
+               # the benefit of this optimisation.
+               $check_commit_hook=<<"EOF";
+       {
+               int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR, 0666);
+               if (fd != -1) {
+                       if (flock(fd, LOCK_SH | LOCK_NB) != 0)
+                               exit(0);
+                       close(fd);
+               }
+       }
+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. The fd of the lock is stored in
+               # IKIWIKI_CGILOCK_FD so unlockwiki can close it.
+               $pre_exec=<<"EOF";
+       {
+               int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
+               if (fd != -1 && flock(fd, LOCK_EX) == 0) {
+                       char *fd_s;
+                       asprintf(&fd_s, "%i", fd);
+                       setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
+               }
+       }
+EOF
+       }
+

        $Data::Dumper::Indent=0; # no newlines
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $Data::Dumper::Indent=0; # no newlines
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;


@@ -56,9 +99,12 @@ EOF
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
 #include <sys/types.h>
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
 #include <sys/types.h>

+#include <sys/stat.h>
+#include <fcntl.h>

 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

+#include <sys/file.h>

 
 extern char **environ;
 char *newenviron[$#envsave+6];
 
 extern char **environ;
 char *newenviron[$#envsave+6];


@@ -75,6 +121,7 @@ addenv(char *var, char *val) {
 int main (int argc, char **argv) {
        char *s;
 
 int main (int argc, char **argv) {
        char *s;
 

+$check_commit_hook

 $test_receive
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
 $test_receive
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";


@@ -93,6 +140,7 @@ $envsave
                exit(1);
        }
 
                exit(1);
        }
 

+$pre_exec

        execl("$this", "$this", NULL);
        perror("exec $this");
        exit(1);
        execl("$this", "$this", NULL);
        perror("exec $this");
        exit(1);