po(todo): test results for markup languages support, thoughts about renaming/deleting

[ikiwiki.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 99237d3b5c5b46b6b5afb85436938b1cbbd329c4..dd9971a34f8a5835b9b5b2bb1f698ef7b4f6e17e 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -8,7 +8,7 @@ use File::Spec;
 use Data::Dumper;
 use IkiWiki;
 
-sub gen_wrapper () { #{{{
+sub gen_wrapper () {
        $config{srcdir}=File::Spec->rel2abs($config{srcdir});
        $config{destdir}=File::Spec->rel2abs($config{destdir});
        my $this=File::Spec->rel2abs($0);
@@ -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,23 @@ 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. 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']);
@@ -122,6 +140,7 @@ $envsave
                exit(1);
        }
 
+$pre_exec
        execl("$this", "$this", NULL);
        perror("exec $this");
        exit(1);
@@ -154,6 +173,6 @@ EOF
        #translators: The parameter is a filename.
        printf(gettext("successfully generated %s"), $wrapper);
        print "\n";
-} #}}}
+}
 
 1