| author | Lars Hjemli <hjemli@gmail.com> | 2006-12-11 11:10:12 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-11 11:10:12 (UTC) |
| commit | 318d106300102c19d114a4ea89265b0a4060d9cb (patch) (side-by-side diff) | |
| tree | 3752575abec74ee0a2b544e36e3cc8f9cdfa1e66 /cgit.c | |
| parent | a581ed8d6c15b0734b082fbadf0a907c2b170423 (diff) | |
| download | cgit-318d106300102c19d114a4ea89265b0a4060d9cb.zip cgit-318d106300102c19d114a4ea89265b0a4060d9cb.tar.gz cgit-318d106300102c19d114a4ea89265b0a4060d9cb.tar.bz2 | |
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>
| -rw-r--r-- | cgit.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -26,16 +26,17 @@ char *cgit_root = "/usr/src/git"; char *cgit_root_title = "Git repository browser"; char *cgit_css = "/cgit.css"; char *cgit_logo = "/git-logo.png"; char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 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; int cgit_cache_static_ttl = -1; int cgit_cache_max_create_time = 5; char *cgit_repo_name = NULL; char *cgit_repo_desc = NULL; @@ -460,21 +461,27 @@ static void cgit_fill_cache(struct cacheitem *item) if (cgit_query_repo) cgit_print_repo_page(); else cgit_print_repolist(); } 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)) cgit_fill_cache(item); cache_unlock(item); } else if (cache_expired(item) && cache_lock(item)) { if (cache_expired(item)) cgit_fill_cache(item); |