|
diff --git a/cache.c b/cache.c index 2e1ef8c..b947a34 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -90,18 +90,23 @@ int cache_lock(struct cacheitem *item) |
90 | cache_refill_overdue(lockfile) && !unlink(lockfile)) |
90 | cache_refill_overdue(lockfile) && !unlink(lockfile)) |
91 | goto top; |
91 | goto top; |
92 | |
92 | |
93 | return (item->fd > 0); |
93 | return (item->fd > 0); |
94 | } |
94 | } |
95 | |
95 | |
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 |
|
@@ -52,31 +52,37 @@ static void cgit_check_cache(struct cacheitem *item) |
52 | |
52 | |
53 | cache_prepare(item); |
53 | cache_prepare(item); |
54 | top: |
54 | top: |
55 | if (++i > cgit_max_lock_attempts) { |
55 | if (++i > cgit_max_lock_attempts) { |
56 | die("cgit_refresh_cache: unable to lock %s: %s", |
56 | die("cgit_refresh_cache: unable to lock %s: %s", |
57 | item->name, strerror(errno)); |
57 | item->name, strerror(errno)); |
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]; |
77 | ssize_t i; |
83 | ssize_t i; |
78 | |
84 | |
79 | int fd = open(item->name, O_RDONLY); |
85 | int fd = open(item->name, O_RDONLY); |
80 | if (fd<0) |
86 | if (fd<0) |
81 | die("Unable to open cached file %s", item->name); |
87 | die("Unable to open cached file %s", item->name); |
82 | |
88 | |
|
|
diff --git a/cgit.h b/cgit.h index c1dcc97..c9554a7 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -57,24 +57,25 @@ extern void html(const char *txt); |
57 | extern void htmlf(const char *format,...); |
57 | extern void htmlf(const char *format,...); |
58 | extern void html_txt(char *txt); |
58 | extern void html_txt(char *txt); |
59 | extern void html_attr(char *txt); |
59 | extern void html_attr(char *txt); |
60 | extern void html_link_open(char *url, char *title, char *class); |
60 | extern void html_link_open(char *url, char *title, char *class); |
61 | extern void html_link_close(void); |
61 | extern void html_link_close(void); |
62 | |
62 | |
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); |
75 | |
76 | |
76 | extern void cgit_print_error(char *msg); |
77 | extern void cgit_print_error(char *msg); |
77 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
78 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
78 | extern void cgit_print_docend(); |
79 | extern void cgit_print_docend(); |
79 | extern void cgit_print_pageheader(char *title); |
80 | extern void cgit_print_pageheader(char *title); |
80 | |
81 | |
|