about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--cache.c35
-rw-r--r--cgit.c9
-rw-r--r--cgit.h1
3 files changed, 31 insertions, 14 deletions
diff --git a/cache.c b/cache.c index 0ffa502..2e1ef8c 100644 --- a/cache.c +++ b/cache.c
@@ -61,26 +61,35 @@ int cache_create_dirs()
61 return 1; 61 return 1;
62} 62}
63 63
64int 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
64int cache_lock(struct cacheitem *item) 74int 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);
85} 94}
86 95
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;
31 31
32char *cgit_cache_root = "/var/cache/cgit"; 32char *cgit_cache_root = "/var/cache/cgit";
33 33
34int cgit_max_lock_attempts = 5;
34int cgit_cache_root_ttl = 5; 35int cgit_cache_root_ttl = 5;
35int cgit_cache_repo_ttl = 5; 36int cgit_cache_repo_ttl = 5;
36int cgit_cache_dynamic_ttl = 5; 37int cgit_cache_dynamic_ttl = 5;
@@ -465,11 +466,17 @@ static void cgit_fill_cache(struct cacheitem *item)
465 466
466static void cgit_refresh_cache(struct cacheitem *item) 467static void cgit_refresh_cache(struct cacheitem *item)
467{ 468{
469 int i = 0;
470
468 cache_prepare(item); 471 cache_prepare(item);
469 top: 472 top:
473 if (++i > cgit_max_lock_attempts) {
474 die("cgit_refresh_cache: unable to lock %s: %s",
475 item->name, strerror(errno));
476 }
470 if (!cache_exist(item)) { 477 if (!cache_exist(item)) {
471 if (!cache_lock(item)) { 478 if (!cache_lock(item)) {
472 sched_yield(); 479 sleep(1);
473 goto top; 480 goto top;
474 } 481 }
475 if (!cache_exist(item)) 482 if (!cache_exist(item))
diff --git a/cgit.h b/cgit.h index 3b0994a..7e4bfef 100644 --- a/cgit.h +++ b/cgit.h
@@ -23,6 +23,7 @@ extern char *cgit_logo_link;
23extern char *cgit_virtual_root; 23extern char *cgit_virtual_root;
24extern char *cgit_cache_root; 24extern char *cgit_cache_root;
25 25
26extern int cgit_max_lock_attempts;
26extern int cgit_cache_root_ttl; 27extern int cgit_cache_root_ttl;
27extern int cgit_cache_repo_ttl; 28extern int cgit_cache_repo_ttl;
28extern int cgit_cache_dynamic_ttl; 29extern int cgit_cache_dynamic_ttl;