diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2006-12-11 12:10:12 +0100 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-11 12:10:12 +0100 |
| commit | 318d106300102c19d114a4ea89265b0a4060d9cb (patch) | |
| tree | 3752575abec74ee0a2b544e36e3cc8f9cdfa1e66 /cgit.c | |
| parent | Let 'make install' clear all cachefiles (diff) | |
| download | cgit-pink-318d106300102c19d114a4ea89265b0a4060d9cb.tar.gz cgit-pink-318d106300102c19d114a4ea89265b0a4060d9cb.zip | |
Avoid infinite loops in caching layer
Add a global variable, cgit_max_lock_attemps, to avoid the possibility of infinite loops when failing to acquire a lockfile. This could happen on broken setups or under crazy server load. Incidentally, this also fixes a lurking bug in cache_lock() where an uninitialized returnvalue was used. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c')
| -rw-r--r-- | cgit.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c index 7f14016..dc91125 100644 --- a/cgit.c +++ b/cgit.c @@ -31,6 +31,7 @@ char *cgit_virtual_root = NULL; char *cgit_cache_root = "/var/cache/cgit"; +int cgit_max_lock_attempts = 5; int cgit_cache_root_ttl = 5; int cgit_cache_repo_ttl = 5; int cgit_cache_dynamic_ttl = 5; @@ -465,11 +466,17 @@ static void cgit_fill_cache(struct cacheitem *item) static void cgit_refresh_cache(struct cacheitem *item) { + int i = 0; + cache_prepare(item); top: + if (++i > cgit_max_lock_attempts) { + die("cgit_refresh_cache: unable to lock %s: %s", + item->name, strerror(errno)); + } if (!cache_exist(item)) { if (!cache_lock(item)) { - sched_yield(); + sleep(1); goto top; } if (!cache_exist(item)) |