diff options
author | Lars Hjemli <hjemli@gmail.com> | 2006-12-11 09:57:58 +0100 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-11 09:57:58 +0100 |
commit | f5069d88dff7a7ed2f4665904b03e906cca75a7c (patch) | |
tree | 4c9bfa3aaf931af4a345ffb9563b19825c38b628 /cgit.c | |
parent | Add version identifier in generated files (diff) | |
download | cgit-pink-f5069d88dff7a7ed2f4665904b03e906cca75a7c.tar.gz cgit-pink-f5069d88dff7a7ed2f4665904b03e906cca75a7c.zip |
Fix cache algorithm loophole
This closes the door for unneccessary calls to cgit_fill_cache(). Noticed by Linus. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c')
-rw-r--r-- | cgit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cgit.c b/cgit.c index 110face..7f14016 100644 --- a/cgit.c +++ b/cgit.c @@ -465,20 +465,20 @@ static void cgit_fill_cache(struct cacheitem *item) static void cgit_refresh_cache(struct cacheitem *item) { + cache_prepare(item); top: - if (!cache_lookup(item)) { - if (cache_lock(item)) { - cgit_fill_cache(item); - cache_unlock(item); - } else { + if (!cache_exist(item)) { + if (!cache_lock(item)) { sched_yield(); goto top; } - } else if (cache_expired(item)) { - if (cache_lock(item)) { + if (!cache_exist(item)) cgit_fill_cache(item); - cache_unlock(item); - } + cache_unlock(item); + } else if (cache_expired(item) && cache_lock(item)) { + if (cache_expired(item)) + cgit_fill_cache(item); + cache_unlock(item); } } |