| -rw-r--r-- | cgit.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -18,32 +18,33 @@ const char cgit_error[] = "<div class='error'>%s</div>"; const char cgit_lib_error[] = "<div class='error'>%s: %s</div>"; int htmlfd = 0; 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; char *cgit_repo_owner = NULL; int cgit_query_has_symref = 0; int cgit_query_has_sha1 = 0; char *cgit_querystring = NULL; char *cgit_query_repo = NULL; char *cgit_query_page = NULL; @@ -452,37 +453,43 @@ static void cgit_print_repo_page() } cgit_print_docend(); } static void cgit_fill_cache(struct cacheitem *item) { htmlfd = item->fd; item->st.st_mtime = time(NULL); 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); cache_unlock(item); } } static void cgit_print_cache(struct cacheitem *item) { static char buf[4096]; ssize_t i; |