git: update to v2.46.0

[ps-cgit] / cache.c

diff --git a/cache.c b/cache.c
index add647ef4661648f922ed246141c216e80b2150f..1c843ba873d00152263a0005a0e0dd8d230c752b 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -1,6 +1,6 @@
 /* cache.c: cache management
  *
 /* cache.c: cache management
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -15,22 +15,25 @@
 
 #include "cgit.h"
 #include "cache.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 ttl;
        cache_fill_fn fn;

-       void *cbdata;

        int cache_fd;
        int lock_fd;
        int cache_fd;
        int lock_fd;

+       int stdout_fd;

        const char *cache_name;
        const char *lock_name;
        int match;
        struct stat cache_st;
        const char *cache_name;
        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 +45,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)


@@ -51,7 +54,7 @@ static int open_slot(struct cache_slot *slot)
        if (fstat(slot->cache_fd, &slot->cache_st))
                return errno;
 
        if (fstat(slot->cache_fd, &slot->cache_st))
                return errno;
 

-       slot->bufsize = read(slot->cache_fd, slot->buf, sizeof(slot->buf));
+       slot->bufsize = xread(slot->cache_fd, slot->buf, sizeof(slot->buf));

        if (slot->bufsize < 0)
                return errno;
 
        if (slot->bufsize < 0)
                return errno;
 


@@ -59,37 +62,68 @@ 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;
 }
 
 /* Close the active cache slot */
 
        return 0;
 }
 
 /* Close the active cache slot */

-static void close_slot(struct cache_slot *slot)
+static int close_slot(struct cache_slot *slot)

 {
 {

+       int err = 0;

        if (slot->cache_fd > 0) {
        if (slot->cache_fd > 0) {

-               close(slot->cache_fd);
-               slot->cache_fd = -1;
+               if (close(slot->cache_fd))
+                       err = errno;
+               else
+                       slot->cache_fd = -1;

        }
        }

+       return err;

 }
 
 /* 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)
 {

-       ssize_t i, j = 0;
+       off_t off;
+#ifdef HAVE_LINUX_SENDFILE
+       off_t size;
+#endif
+
+       off = slot->keylen + 1;
+
+#ifdef HAVE_LINUX_SENDFILE
+       size = slot->cache_st.st_size;
+
+       do {
+               ssize_t ret;
+               ret = sendfile(STDOUT_FILENO, slot->cache_fd, &off, size - off);
+               if (ret < 0) {
+                       if (errno == EAGAIN || errno == EINTR)
+                               continue;
+                       /* Fall back to read/write on EINVAL or ENOSYS */
+                       if (errno == EINVAL || errno == ENOSYS)
+                               break;
+                       return errno;
+               }
+               if (off == size)
+                       return 0;
+       } while (1);
+#endif

 
 

-       i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET);
-       if (i != slot->keylen + 1)
+       if (lseek(slot->cache_fd, off, SEEK_SET) != off)

                return errno;
 
                return errno;
 

-       while((i=read(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0)
-               j = write(STDOUT_FILENO, slot->buf, i);
-
-       if (j < 0)
-               return errno;
-       else
-               return 0;
+       do {
+               ssize_t ret;
+               ret = xread(slot->cache_fd, slot->buf, sizeof(slot->buf));
+               if (ret < 0)
+                       return errno;
+               if (ret == 0)
+                       return 0;
+               if (write_in_full(STDOUT_FILENO, slot->buf, ret) < 0)
+                       return errno;
+       } while (1);

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


@@ -98,7 +132,7 @@ static int is_expired(struct cache_slot *slot)
        if (slot->ttl < 0)
                return 0;
        else
        if (slot->ttl < 0)
                return 0;
        else

-               return slot->cache_st.st_mtime + slot->ttl*60 < time(NULL);
+               return slot->cache_st.st_mtime + slot->ttl * 60 < time(NULL);

 }
 
 /* Check if the slot has been modified since we opened it.
 }
 
 /* Check if the slot has been modified since we opened it.


@@ -116,12 +150,16 @@ static int is_modified(struct cache_slot *slot)
 }
 
 /* Close an open lockfile */
 }
 
 /* Close an open lockfile */

-static void close_lock(struct cache_slot *slot)
+static int close_lock(struct cache_slot *slot)

 {
 {

+       int err = 0;

        if (slot->lock_fd > 0) {
        if (slot->lock_fd > 0) {

-               close(slot->lock_fd);
-               slot->lock_fd = -1;
+               if (close(slot->lock_fd))
+                       err = errno;
+               else
+                       slot->lock_fd = -1;

        }
        }

+       return err;

 }
 
 /* Create a lockfile used to store the generated content for a cache
 }
 
 /* Create a lockfile used to store the generated content for a cache


@@ -130,11 +168,25 @@ static void 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,
-                            S_IRUSR|S_IWUSR);
+       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;
        if (slot->lock_fd == -1)
                return errno;

-       write(slot->lock_fd, slot->key, slot->keylen + 1);
+       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;
 }
 
        return 0;
 }
 


@@ -150,7 +202,18 @@ static int unlock_slot(struct cache_slot *slot, int replace_old_slot)
                err = rename(slot->lock_name, slot->cache_name);
        else
                err = unlink(slot->lock_name);
                err = rename(slot->lock_name, slot->cache_name);
        else
                err = unlink(slot->lock_name);

-       return err;
+
+       /* Restore stdout and close the temporary FD. */
+       if (slot->stdout_fd >= 0) {
+               dup2(slot->stdout_fd, STDOUT_FILENO);
+               close(slot->stdout_fd);
+               slot->stdout_fd = -1;
+       }
+
+       if (err)
+               return errno;
+
+       return 0;

 }
 
 /* Generate the content for the current cache slot by redirecting
 }
 
 /* Generate the content for the current cache slot by redirecting


@@ -158,11 +221,9 @@ static int unlock_slot(struct cache_slot *slot, int replace_old_slot)
  */
 static int fill_slot(struct cache_slot *slot)
 {
  */
 static int fill_slot(struct cache_slot *slot)
 {

-       int tmp;
-

        /* Preserve stdout */
        /* Preserve stdout */

-       tmp = dup(STDOUT_FILENO);
-       if (tmp == -1)
+       slot->stdout_fd = dup(STDOUT_FILENO);
+       if (slot->stdout_fd == -1)

                return errno;
 
        /* Redirect stdout to lockfile */
                return errno;
 
        /* Redirect stdout to lockfile */


@@ -170,14 +231,16 @@ static int fill_slot(struct cache_slot *slot)
                return errno;
 
        /* Generate cache content */
                return errno;
 
        /* Generate cache content */

-       slot->fn(slot->cbdata);
+       slot->fn();

 
 

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

                return errno;
 
                return errno;
 

-       /* Close the temporary filedescriptor */
-       close(tmp);

        return 0;
 }
 
        return 0;
 }
 


@@ -196,7 +259,7 @@ unsigned long hash_str(const char *str)
        if (!s)
                return h;
 
        if (!s)
                return h;
 

-       while(*s) {
+       while (*s) {

                h *= FNV_PRIME;
                h ^= *s++;
        }
                h *= FNV_PRIME;
                h ^= *s++;
        }


@@ -237,15 +300,20 @@ static int process_slot(struct cache_slot *slot)
                                }
                        }
                }
                                }
                        }
                }

-               print_slot(slot);
+               if ((err = print_slot(slot)) != 0) {
+                       cache_log("[cgit] error printing cache %s: %s (%d)\n",
+                                 slot->cache_name,
+                                 strerror(err),
+                                 err);
+               }

                close_slot(slot);
                close_slot(slot);

-               return 0;
+               return err;

        }
 
        /* 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).
         */
 


@@ -253,7 +321,7 @@ static int process_slot(struct cache_slot *slot)
        if ((err = lock_slot(slot)) != 0) {
                cache_log("[cgit] Unable to lock slot %s: %s (%d)\n",
                          slot->lock_name, strerror(err), err);
        if ((err = lock_slot(slot)) != 0) {
                cache_log("[cgit] Unable to lock slot %s: %s (%d)\n",
                          slot->lock_name, strerror(err), err);

-               slot->fn(slot->cbdata);
+               slot->fn();

                return 0;
        }
 
                return 0;
        }
 


@@ -262,7 +330,7 @@ static int process_slot(struct cache_slot *slot)
                          slot->lock_name, strerror(err), err);
                unlock_slot(slot, 0);
                close_lock(slot);
                          slot->lock_name, strerror(err), err);
                unlock_slot(slot, 0);
                close_lock(slot);

-               slot->fn(slot->cbdata);
+               slot->fn();

                return 0;
        }
        // We've got a valid cache slot in the lock file, which
                return 0;
        }
        // We've got a valid cache slot in the lock file, which


@@ -274,76 +342,76 @@ static int process_slot(struct cache_slot *slot)
        // the lock file.
        slot->cache_fd = slot->lock_fd;
        unlock_slot(slot, 1);
        // the lock file.
        slot->cache_fd = slot->lock_fd;
        unlock_slot(slot, 1);

-       err = print_slot(slot);
+       if ((err = print_slot(slot)) != 0) {
+               cache_log("[cgit] error printing cache %s: %s (%d)\n",
+                         slot->cache_name,
+                         strerror(err),
+                         err);
+       }

        close_slot(slot);
        return err;
 }
 
 /* Print cached content to stdout, generate the content if necessary. */
 int cache_process(int size, const char *path, const char *key, int ttl,
        close_slot(slot);
        return err;
 }
 
 /* Print cached content to stdout, generate the content if necessary. */
 int cache_process(int size, const char *path, const char *key, int ttl,

-                 cache_fill_fn fn, void *cbdata)
+                 cache_fill_fn fn)

 {
        unsigned long hash;
 {
        unsigned long hash;

-       int len, i;
-       char filename[1024];
-       char lockname[1024 + 5];  /* 5 = ".lock" */
+       int i;
+       struct strbuf filename = STRBUF_INIT;
+       struct strbuf lockname = STRBUF_INIT;

        struct cache_slot slot;
        struct cache_slot slot;

+       int result;

 
        /* If the cache is disabled, just generate the content */
 
        /* If the cache is disabled, just generate the content */

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

                return 0;
        }
 
        /* Verify input, calculate filenames */
        if (!path) {
                cache_log("[cgit] Cache path not specified, caching is disabled\n");
                return 0;
        }
 
        /* Verify input, calculate filenames */
        if (!path) {
                cache_log("[cgit] Cache path not specified, caching is disabled\n");

-               fn(cbdata);
-               return 0;
-       }
-       len = strlen(path);
-       if (len > sizeof(filename) - 10) { /* 10 = "/01234567\0" */
-               cache_log("[cgit] Cache path too long, caching is disabled: %s\n",
-                         path);
-               fn(cbdata);
+               fn();

                return 0;
        }
        if (!key)
                key = "";
        hash = hash_str(key) % size;
                return 0;
        }
        if (!key)
                key = "";
        hash = hash_str(key) % size;

-       strcpy(filename, path);
-       if (filename[len - 1] != '/')
-               filename[len++] = '/';
-       for(i = 0; i < 8; i++) {
-               sprintf(filename + len++, "%x",
-                       (unsigned char)(hash & 0xf));
+       strbuf_addstr(&filename, path);
+       strbuf_ensure_end(&filename, '/');
+       for (i = 0; i < 8; i++) {
+               strbuf_addf(&filename, "%x", (unsigned char)(hash & 0xf));

                hash >>= 4;
        }
                hash >>= 4;
        }

-       filename[len] = '\0';
-       strcpy(lockname, filename);
-       strcpy(lockname + len, ".lock");
+       strbuf_addbuf(&lockname, &filename);
+       strbuf_addstr(&lockname, ".lock");

        slot.fn = fn;
        slot.fn = fn;

-       slot.cbdata = cbdata;

        slot.ttl = ttl;
        slot.ttl = ttl;

-       slot.cache_name = filename;
-       slot.lock_name = lockname;
+       slot.stdout_fd = -1;
+       slot.cache_name = filename.buf;
+       slot.lock_name = lockname.buf;

        slot.key = key;
        slot.keylen = strlen(key);
        slot.key = key;
        slot.keylen = strlen(key);

-       return process_slot(&slot);
+       result = process_slot(&slot);
+
+       strbuf_release(&filename);
+       strbuf_release(&lockname);
+       return result;

 }
 
 /* Return a strftime formatted date/time
  * NB: the result from this function is to shared memory
  */
 }
 
 /* Return a strftime formatted date/time
  * NB: the result from this function is to shared memory
  */

-char *sprintftime(const char *format, time_t time)
+static char *sprintftime(const char *format, time_t time)

 {
        static char buf[64];
 {
        static char buf[64];

-       struct tm *tm;
+       struct tm tm;

 
        if (!time)
                return NULL;
 
        if (!time)
                return NULL;

-       tm = gmtime(&time);
-       strftime(buf, sizeof(buf)-1, format, tm);
+       gmtime_r(&time, &tm);
+       strftime(buf, sizeof(buf)-1, format, &tm);

        return buf;
 }
 
        return buf;
 }
 


@@ -352,19 +420,14 @@ 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;
-       char fullname[1024];
-       char *name;
+       struct cache_slot slot = { NULL };
+       struct strbuf fullname = STRBUF_INIT;
+       size_t prefixlen;

 
        if (!path) {
                cache_log("[cgit] cache path not specified\n");
                return -1;
        }
 
        if (!path) {
                cache_log("[cgit] cache path not specified\n");
                return -1;
        }

-       if (strlen(path) > 1024 - 10) {
-               cache_log("[cgit] cache path too long: %s\n",
-                         path);
-               return -1;
-       }

        dir = opendir(path);
        if (!dir) {
                err = errno;
        dir = opendir(path);
        if (!dir) {
                err = errno;


@@ -372,31 +435,30 @@ int cache_ls(const char *path)
                          path, strerror(err), err);
                return err;
        }
                          path, strerror(err), err);
                return err;
        }

-       strcpy(fullname, path);
-       name = fullname + strlen(path);
-       if (*(name - 1) != '/') {
-               *name++ = '/';
-               *name = '\0';
-       }
-       slot.cache_name = fullname;
-       while((ent = readdir(dir)) != NULL) {
+       strbuf_addstr(&fullname, path);
+       strbuf_ensure_end(&fullname, '/');
+       prefixlen = fullname.len;
+       while ((ent = readdir(dir)) != NULL) {

                if (strlen(ent->d_name) != 8)
                        continue;
                if (strlen(ent->d_name) != 8)
                        continue;

-               strcpy(name, ent->d_name);
+               strbuf_setlen(&fullname, prefixlen);
+               strbuf_addstr(&fullname, ent->d_name);
+               slot.cache_name = fullname.buf;

                if ((err = open_slot(&slot)) != 0) {
                        cache_log("[cgit] unable to open path %s: %s (%d)\n",
                if ((err = open_slot(&slot)) != 0) {
                        cache_log("[cgit] unable to open path %s: %s (%d)\n",

-                                 fullname, strerror(err), err);
+                                 fullname.buf, strerror(err), err);

                        continue;
                }
                        continue;
                }

-               printf("%s %s %10lld %s\n",
-                      name,
-                      sprintftime("%Y-%m-%d %H:%M:%S",
-                                  slot.cache_st.st_mtime),
-                      slot.cache_st.st_size,
-                      slot.buf);
+               htmlf("%s %s %10"PRIuMAX" %s\n",
+                     fullname.buf,
+                     sprintftime("%Y-%m-%d %H:%M:%S",
+                                 slot.cache_st.st_mtime),
+                     (uintmax_t)slot.cache_st.st_size,
+                     slot.buf);

                close_slot(&slot);
        }
        closedir(dir);
                close_slot(&slot);
        }
        closedir(dir);

+       strbuf_release(&fullname);

        return 0;
 }
 
        return 0;
 }