Unidiff1 files changed, 22 insertions, 13 deletions
|
diff --git a/cache.c b/cache.c index 0ffa502..2e1ef8c 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -63,22 +63,31 @@ int cache_create_dirs() |
63 | |
63 | |
| |
64 | int cache_refill_overdue(const char *lockfile) |
| |
65 | { |
| |
66 | struct stat st; |
| |
67 | |
| |
68 | if (stat(lockfile, &st)) |
| |
69 | return 0; |
| |
70 | else |
| |
71 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); |
| |
72 | } |
| |
73 | |
64 | int cache_lock(struct cacheitem *item) |
74 | int cache_lock(struct cacheitem *item) |
65 | { |
75 | { |
66 | int ret; |
76 | int i = 0; |
67 | char *lockfile = fmt("%s.lock", item->name); |
77 | char *lockfile = fmt("%s.lock", item->name); |
68 | |
78 | |
69 | top: |
79 | top: |
70 | item->fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR|S_IWUSR); |
80 | if (++i > cgit_max_lock_attempts) |
| |
81 | die("cache_lock: unable to lock %s: %s", |
| |
82 | item->name, strerror(errno)); |
| |
83 | |
| |
84 | item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); |
| |
85 | |
71 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
86 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
72 | goto top; |
87 | goto top; |
73 | if (item->fd == NOLOCK && errno == EEXIST) { |
88 | |
74 | struct stat st; |
89 | if (item->fd == NOLOCK && errno == EEXIST && |
75 | time_t t; |
90 | cache_refill_overdue(lockfile) && !unlink(lockfile)) |
76 | if (stat(lockfile, &st)) |
| |
77 | return ret; |
| |
78 | t = time(NULL); |
| |
79 | if (t-st.st_mtime > cgit_cache_max_create_time && |
| |
80 | !unlink(lockfile)) |
| |
81 | goto top; |
91 | goto top; |
82 | return 0; |
92 | |
83 | } |
| |
84 | return (item->fd > 0); |
93 | return (item->fd > 0); |
|