|
diff --git a/cache.c b/cache.c index b034c48..0ffa502 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -1,44 +1,48 @@ |
1 | /* cache.c: cache management |
1 | /* cache.c: cache management |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | const int NOLOCK = -1; |
11 | const int NOLOCK = -1; |
12 | |
12 | |
13 | int cache_lookup(struct cacheitem *item) |
13 | void cache_prepare(struct cacheitem *item) |
14 | { |
14 | { |
15 | if (!cgit_query_repo) { |
15 | if (!cgit_query_repo) { |
16 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
16 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
17 | item->ttl = cgit_cache_root_ttl; |
17 | item->ttl = cgit_cache_root_ttl; |
18 | } else if (!cgit_query_page) { |
18 | } else if (!cgit_query_page) { |
19 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
19 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
20 | cgit_query_repo)); |
20 | cgit_query_repo)); |
21 | item->ttl = cgit_cache_repo_ttl; |
21 | item->ttl = cgit_cache_repo_ttl; |
22 | } else { |
22 | } else { |
23 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
23 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
24 | cgit_query_repo, cgit_query_page, |
24 | cgit_query_repo, cgit_query_page, |
25 | cgit_querystring)); |
25 | cgit_querystring)); |
26 | if (cgit_query_has_symref) |
26 | if (cgit_query_has_symref) |
27 | item->ttl = cgit_cache_dynamic_ttl; |
27 | item->ttl = cgit_cache_dynamic_ttl; |
28 | else if (cgit_query_has_sha1) |
28 | else if (cgit_query_has_sha1) |
29 | item->ttl = cgit_cache_static_ttl; |
29 | item->ttl = cgit_cache_static_ttl; |
30 | else |
30 | else |
31 | item->ttl = cgit_cache_repo_ttl; |
31 | item->ttl = cgit_cache_repo_ttl; |
32 | } |
32 | } |
| |
33 | } |
| |
34 | |
| |
35 | int cache_exist(struct cacheitem *item) |
| |
36 | { |
33 | if (stat(item->name, &item->st)) { |
37 | if (stat(item->name, &item->st)) { |
34 | item->st.st_mtime = 0; |
38 | item->st.st_mtime = 0; |
35 | return 0; |
39 | return 0; |
36 | } |
40 | } |
37 | return 1; |
41 | return 1; |
38 | } |
42 | } |
39 | |
43 | |
40 | int cache_create_dirs() |
44 | int cache_create_dirs() |
41 | { |
45 | { |
42 | char *path; |
46 | char *path; |
43 | |
47 | |
44 | if (!cgit_query_repo) |
48 | if (!cgit_query_repo) |
|
|
diff --git a/cgit.c b/cgit.c index 110face..7f14016 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -456,38 +456,38 @@ static void cgit_print_repo_page() |
456 | static void cgit_fill_cache(struct cacheitem *item) |
456 | static void cgit_fill_cache(struct cacheitem *item) |
457 | { |
457 | { |
458 | htmlfd = item->fd; |
458 | htmlfd = item->fd; |
459 | item->st.st_mtime = time(NULL); |
459 | item->st.st_mtime = time(NULL); |
460 | if (cgit_query_repo) |
460 | if (cgit_query_repo) |
461 | cgit_print_repo_page(); |
461 | cgit_print_repo_page(); |
462 | else |
462 | else |
463 | cgit_print_repolist(); |
463 | cgit_print_repolist(); |
464 | } |
464 | } |
465 | |
465 | |
466 | static void cgit_refresh_cache(struct cacheitem *item) |
466 | static void cgit_refresh_cache(struct cacheitem *item) |
467 | { |
467 | { |
| |
468 | cache_prepare(item); |
468 | top: |
469 | top: |
469 | if (!cache_lookup(item)) { |
470 | if (!cache_exist(item)) { |
470 | if (cache_lock(item)) { |
471 | if (!cache_lock(item)) { |
471 | cgit_fill_cache(item); |
| |
472 | cache_unlock(item); |
| |
473 | } else { |
| |
474 | sched_yield(); |
472 | sched_yield(); |
475 | goto top; |
473 | goto top; |
476 | } |
474 | } |
477 | } else if (cache_expired(item)) { |
475 | if (!cache_exist(item)) |
478 | if (cache_lock(item)) { |
| |
479 | cgit_fill_cache(item); |
476 | cgit_fill_cache(item); |
480 | cache_unlock(item); |
477 | cache_unlock(item); |
481 | } |
478 | } else if (cache_expired(item) && cache_lock(item)) { |
| |
479 | if (cache_expired(item)) |
| |
480 | cgit_fill_cache(item); |
| |
481 | cache_unlock(item); |
482 | } |
482 | } |
483 | } |
483 | } |
484 | |
484 | |
485 | static void cgit_print_cache(struct cacheitem *item) |
485 | static void cgit_print_cache(struct cacheitem *item) |
486 | { |
486 | { |
487 | static char buf[4096]; |
487 | static char buf[4096]; |
488 | ssize_t i; |
488 | ssize_t i; |
489 | |
489 | |
490 | int fd = open(item->name, O_RDONLY); |
490 | int fd = open(item->name, O_RDONLY); |
491 | if (fd<0) |
491 | if (fd<0) |
492 | die("Unable to open cached file %s", item->name); |
492 | die("Unable to open cached file %s", item->name); |
493 | |
493 | |
|
|
diff --git a/cgit.h b/cgit.h index 1e084d4..3b0994a 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -47,18 +47,19 @@ extern int htmlfd; |
47 | extern char *fmt(const char *format,...); |
47 | extern char *fmt(const char *format,...); |
48 | |
48 | |
49 | extern void html(const char *txt); |
49 | extern void html(const char *txt); |
50 | extern void htmlf(const char *format,...); |
50 | extern void htmlf(const char *format,...); |
51 | extern void html_txt(char *txt); |
51 | extern void html_txt(char *txt); |
52 | extern void html_attr(char *txt); |
52 | extern void html_attr(char *txt); |
53 | extern void html_link_open(char *url, char *title, char *class); |
53 | extern void html_link_open(char *url, char *title, char *class); |
54 | extern void html_link_close(void); |
54 | extern void html_link_close(void); |
55 | |
55 | |
56 | |
56 | |
57 | extern int cgit_read_config(const char *filename, configfn fn); |
57 | extern int cgit_read_config(const char *filename, configfn fn); |
58 | |
58 | |
59 | extern int cache_lookup(struct cacheitem *item); |
59 | extern void cache_prepare(struct cacheitem *item); |
60 | extern int cache_lock(struct cacheitem *item); |
60 | extern int cache_lock(struct cacheitem *item); |
61 | extern int cache_unlock(struct cacheitem *item); |
61 | extern int cache_unlock(struct cacheitem *item); |
| |
62 | extern int cache_exist(struct cacheitem *item); |
62 | extern int cache_expired(struct cacheitem *item); |
63 | extern int cache_expired(struct cacheitem *item); |
63 | |
64 | |
64 | #endif /* CGIT_H */ |
65 | #endif /* CGIT_H */ |
|