-rw-r--r-- | cache.c | 5 | ||||
-rw-r--r-- | cgit.c | 10 | ||||
-rw-r--r-- | cgit.h | 1 |
3 files changed, 14 insertions, 2 deletions
@@ -98,8 +98,13 @@ int cache_unlock(struct cacheitem *item) close(item->fd); return (rename(fmt("%s.lock", item->name), item->name) == 0); } +int cache_cancel_lock(struct cacheitem *item) +{ + return (unlink(fmt("%s.lock", item->name)) == 0); +} + int cache_expired(struct cacheitem *item) { if (item->ttl < 0) return 0; @@ -60,15 +60,21 @@ static void cgit_check_cache(struct cacheitem *item) if (!cache_lock(item)) { sleep(1); goto top; } - if (!cache_exist(item)) + if (!cache_exist(item)) { cgit_fill_cache(item); cache_unlock(item); + } else { + cache_cancel_lock(item); + } } else if (cache_expired(item) && cache_lock(item)) { - if (cache_expired(item)) + if (cache_expired(item)) { cgit_fill_cache(item); cache_unlock(item); + } else { + cache_cancel_lock(item); + } } } static void cgit_print_cache(struct cacheitem *item) @@ -65,8 +65,9 @@ extern int cgit_parse_query(char *txt, configfn fn); extern void cache_prepare(struct cacheitem *item); extern int cache_lock(struct cacheitem *item); extern int cache_unlock(struct cacheitem *item); +extern int cache_cancel_lock(struct cacheitem *item); extern int cache_exist(struct cacheitem *item); extern int cache_expired(struct cacheitem *item); extern char *cgit_repourl(const char *reponame); |