|
diff --git a/cache.c b/cache.c index 2e1ef8c..b947a34 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -96,12 +96,17 @@ int cache_lock(struct cacheitem *item) |
96 | int cache_unlock(struct cacheitem *item) |
96 | int cache_unlock(struct cacheitem *item) |
97 | { |
97 | { |
98 | close(item->fd); |
98 | close(item->fd); |
99 | return (rename(fmt("%s.lock", item->name), item->name) == 0); |
99 | return (rename(fmt("%s.lock", item->name), item->name) == 0); |
100 | } |
100 | } |
101 | |
101 | |
| |
102 | int cache_cancel_lock(struct cacheitem *item) |
| |
103 | { |
| |
104 | return (unlink(fmt("%s.lock", item->name)) == 0); |
| |
105 | } |
| |
106 | |
102 | int cache_expired(struct cacheitem *item) |
107 | int cache_expired(struct cacheitem *item) |
103 | { |
108 | { |
104 | if (item->ttl < 0) |
109 | if (item->ttl < 0) |
105 | return 0; |
110 | return 0; |
106 | return item->st.st_mtime + item->ttl * 60 < time(NULL); |
111 | return item->st.st_mtime + item->ttl * 60 < time(NULL); |
107 | } |
112 | } |
|
|
diff --git a/cgit.c b/cgit.c index d1abaa0..0f72f2d 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -58,19 +58,25 @@ static void cgit_check_cache(struct cacheitem *item) |
58 | } |
58 | } |
59 | if (!cache_exist(item)) { |
59 | if (!cache_exist(item)) { |
60 | if (!cache_lock(item)) { |
60 | if (!cache_lock(item)) { |
61 | sleep(1); |
61 | sleep(1); |
62 | goto top; |
62 | goto top; |
63 | } |
63 | } |
64 | if (!cache_exist(item)) |
64 | if (!cache_exist(item)) { |
65 | cgit_fill_cache(item); |
65 | cgit_fill_cache(item); |
66 | cache_unlock(item); |
66 | cache_unlock(item); |
| |
67 | } else { |
| |
68 | cache_cancel_lock(item); |
| |
69 | } |
67 | } else if (cache_expired(item) && cache_lock(item)) { |
70 | } else if (cache_expired(item) && cache_lock(item)) { |
68 | if (cache_expired(item)) |
71 | if (cache_expired(item)) { |
69 | cgit_fill_cache(item); |
72 | cgit_fill_cache(item); |
70 | cache_unlock(item); |
73 | cache_unlock(item); |
| |
74 | } else { |
| |
75 | cache_cancel_lock(item); |
| |
76 | } |
71 | } |
77 | } |
72 | } |
78 | } |
73 | |
79 | |
74 | static void cgit_print_cache(struct cacheitem *item) |
80 | static void cgit_print_cache(struct cacheitem *item) |
75 | { |
81 | { |
76 | static char buf[4096]; |
82 | static char buf[4096]; |
|
|
diff --git a/cgit.h b/cgit.h index c1dcc97..c9554a7 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -63,12 +63,13 @@ extern void html_link_close(void); |
63 | extern int cgit_read_config(const char *filename, configfn fn); |
63 | extern int cgit_read_config(const char *filename, configfn fn); |
64 | extern int cgit_parse_query(char *txt, configfn fn); |
64 | extern int cgit_parse_query(char *txt, configfn fn); |
65 | |
65 | |
66 | extern void cache_prepare(struct cacheitem *item); |
66 | extern void cache_prepare(struct cacheitem *item); |
67 | extern int cache_lock(struct cacheitem *item); |
67 | extern int cache_lock(struct cacheitem *item); |
68 | extern int cache_unlock(struct cacheitem *item); |
68 | extern int cache_unlock(struct cacheitem *item); |
| |
69 | extern int cache_cancel_lock(struct cacheitem *item); |
69 | extern int cache_exist(struct cacheitem *item); |
70 | extern int cache_exist(struct cacheitem *item); |
70 | extern int cache_expired(struct cacheitem *item); |
71 | extern int cache_expired(struct cacheitem *item); |
71 | |
72 | |
72 | extern char *cgit_repourl(const char *reponame); |
73 | extern char *cgit_repourl(const char *reponame); |
73 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
74 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
74 | const char *query); |
75 | const char *query); |
|