doc: use consistent id's when generating html files

[cgit.git] / cache.c

diff --git a/cache.c b/cache.c
index fcd461ffe20e29d111e8186f6e924c096f2099e6..0901e6e0111ef98b8133bfeb149245e4f0526c6d 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -16,12 +16,15 @@
 #include "cgit.h"
 #include "cache.h"
 #include "html.h"
 #include "cgit.h"
 #include "cache.h"
 #include "html.h"

+#ifdef HAVE_LINUX_SENDFILE
+#include <sys/sendfile.h>
+#endif

 
 #define CACHE_BUFSIZE (1024 * 4)
 
 struct cache_slot {
        const char *key;
 
 #define CACHE_BUFSIZE (1024 * 4)
 
 struct cache_slot {
        const char *key;

-       int keylen;
+       size_t keylen;

        int ttl;
        cache_fill_fn fn;
        int cache_fd;
        int ttl;
        cache_fill_fn fn;
        int cache_fd;


@@ -30,7 +33,6 @@ struct cache_slot {
        const char *lock_name;
        int match;
        struct stat cache_st;
        const char *lock_name;
        int match;
        struct stat cache_st;

-       struct stat lock_st;

        int bufsize;
        char buf[CACHE_BUFSIZE];
 };
        int bufsize;
        char buf[CACHE_BUFSIZE];
 };


@@ -42,7 +44,7 @@ struct cache_slot {
 static int open_slot(struct cache_slot *slot)
 {
        char *bufz;
 static int open_slot(struct cache_slot *slot)
 {
        char *bufz;

-       int bufkeylen = -1;
+       ssize_t bufkeylen = -1;

 
        slot->cache_fd = open(slot->cache_name, O_RDONLY);
        if (slot->cache_fd == -1)
 
        slot->cache_fd = open(slot->cache_name, O_RDONLY);
        if (slot->cache_fd == -1)


@@ -59,8 +61,9 @@ static int open_slot(struct cache_slot *slot)
        if (bufz)
                bufkeylen = bufz - slot->buf;
 
        if (bufz)
                bufkeylen = bufz - slot->buf;
 

-       slot->match = bufkeylen == slot->keylen &&
-           !memcmp(slot->key, slot->buf, bufkeylen + 1);
+       if (slot->key)
+               slot->match = bufkeylen == slot->keylen &&
+                   !memcmp(slot->key, slot->buf, bufkeylen + 1);

 
        return 0;
 }
 
        return 0;
 }


@@ -81,6 +84,23 @@ static int close_slot(struct cache_slot *slot)
 /* Print the content of the active cache slot (but skip the key). */
 static int print_slot(struct cache_slot *slot)
 {
 /* Print the content of the active cache slot (but skip the key). */
 static int print_slot(struct cache_slot *slot)
 {

+#ifdef HAVE_LINUX_SENDFILE
+       off_t start_off;
+       int ret;
+
+       start_off = slot->keylen + 1;
+
+       do {
+               ret = sendfile(STDOUT_FILENO, slot->cache_fd, &start_off,
+                               slot->cache_st.st_size - start_off);
+               if (ret < 0) {
+                       if (errno == EAGAIN || errno == EINTR)
+                               continue;
+                       return errno;
+               }
+               return 0;
+       } while (1);
+#else

        ssize_t i, j;
 
        i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET);
        ssize_t i, j;
 
        i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET);


@@ -97,6 +117,7 @@ static int print_slot(struct cache_slot *slot)
                return errno;
        else
                return 0;
                return errno;
        else
                return 0;

+#endif

 }
 
 /* Check if the slot has expired */
 }
 
 /* Check if the slot has expired */


@@ -141,10 +162,23 @@ static int close_lock(struct cache_slot *slot)
  */
 static int lock_slot(struct cache_slot *slot)
 {
  */
 static int lock_slot(struct cache_slot *slot)
 {

-       slot->lock_fd = open(slot->lock_name, O_RDWR | O_CREAT | O_EXCL,
+       struct flock lock = {
+               .l_type = F_WRLCK,
+               .l_whence = SEEK_SET,
+               .l_start = 0,
+               .l_len = 0,
+       };
+
+       slot->lock_fd = open(slot->lock_name, O_RDWR | O_CREAT,

                             S_IRUSR | S_IWUSR);
        if (slot->lock_fd == -1)
                return errno;
                             S_IRUSR | S_IWUSR);
        if (slot->lock_fd == -1)
                return errno;

+       if (fcntl(slot->lock_fd, F_SETLK, &lock) < 0) {
+               int saved_errno = errno;
+               close(slot->lock_fd);
+               slot->lock_fd = -1;
+               return saved_errno;
+       }

        if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
                return errno;
        return 0;
        if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0)
                return errno;
        return 0;


@@ -182,15 +216,31 @@ static int fill_slot(struct cache_slot *slot)
                return errno;
 
        /* Redirect stdout to lockfile */
                return errno;
 
        /* Redirect stdout to lockfile */

-       if (dup2(slot->lock_fd, STDOUT_FILENO) == -1)
+       if (dup2(slot->lock_fd, STDOUT_FILENO) == -1) {
+               close(tmp);

                return errno;
                return errno;

+       }

 
        /* Generate cache content */
        slot->fn();
 
 
        /* Generate cache content */
        slot->fn();
 

+       /* Make sure any buffered data is flushed to the file */
+       if (fflush(stdout)) {
+               close(tmp);
+               return errno;
+       }
+
+       /* update stat info */
+       if (fstat(slot->lock_fd, &slot->cache_st)) {
+               close(tmp);
+               return errno;
+       }
+

        /* Restore stdout */
        /* Restore stdout */

-       if (dup2(tmp, STDOUT_FILENO) == -1)
+       if (dup2(tmp, STDOUT_FILENO) == -1) {
+               close(tmp);

                return errno;
                return errno;

+       }

 
        /* Close the temporary filedescriptor */
        if (close(tmp))
 
        /* Close the temporary filedescriptor */
        if (close(tmp))


@@ -268,7 +318,7 @@ static int process_slot(struct cache_slot *slot)
        /* If the cache slot does not exist (or its key doesn't match the
         * current key), lets try to create a new cache slot for this
         * request. If this fails (for whatever reason), lets just generate
        /* If the cache slot does not exist (or its key doesn't match the
         * current key), lets try to create a new cache slot for this
         * request. If this fails (for whatever reason), lets just generate

-        * the content without caching it and fool the caller to belive
+        * the content without caching it and fool the caller to believe

         * everything worked out (but print a warning on stdout).
         */
 
         * everything worked out (but print a warning on stdout).
         */
 


@@ -319,7 +369,7 @@ int cache_process(int size, const char *path, const char *key, int ttl,
        int result;
 
        /* If the cache is disabled, just generate the content */
        int result;
 
        /* If the cache is disabled, just generate the content */

-       if (size <= 0) {
+       if (size <= 0 || ttl == 0) {

                fn();
                return 0;
        }
                fn();
                return 0;
        }


@@ -374,7 +424,7 @@ int cache_ls(const char *path)
        DIR *dir;
        struct dirent *ent;
        int err = 0;
        DIR *dir;
        struct dirent *ent;
        int err = 0;

-       struct cache_slot slot = { 0 };
+       struct cache_slot slot = { NULL };

        struct strbuf fullname = STRBUF_INIT;
        size_t prefixlen;
 
        struct strbuf fullname = STRBUF_INIT;
        size_t prefixlen;