Rename config.c to parsing.c + move cgit_parse_query from cgit.c to parsing.c

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 7f14016fb70ecb380ffafaa3e7f9f8d92fb362c5..5567859c0e01f310c960de8c119526ff1ba5ceb5 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -31,6 +31,7 @@ char *cgit_virtual_root = NULL;
 
 char *cgit_cache_root   = "/var/cache/cgit";
 
 
 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_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;


@@ -52,32 +53,6 @@ char *cgit_query_sha1   = NULL;
 
 struct cacheitem cacheitem;
 
 
 struct cacheitem cacheitem;
 

-int cgit_parse_query(char *txt, configfn fn)
-{
-       char *t, *value = NULL, c;
-
-       if (!txt)
-               return 0;
-
-       t = txt = xstrdup(txt);
- 
-       while((c=*t) != '\0') {
-               if (c=='=') {
-                       *t = '\0';
-                       value = t+1;
-               } else if (c=='&') {
-                       *t = '\0';
-                       (*fn)(txt, value);
-                       txt = t+1;
-                       value = NULL;
-               }
-               t++;
-       }
-       if (t!=txt)
-               (*fn)(txt, value);
-       return 0;
-}
-

 void cgit_global_config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root"))
 void cgit_global_config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root"))


@@ -465,11 +440,17 @@ static void cgit_fill_cache(struct cacheitem *item)
 
 static void cgit_refresh_cache(struct cacheitem *item)
 {
 
 static void cgit_refresh_cache(struct cacheitem *item)
 {

+       int i = 0;
+

        cache_prepare(item);
  top:
        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)) {
        if (!cache_exist(item)) {
                if (!cache_lock(item)) {

-                       sched_yield();
+                       sleep(1);

                        goto top;
                }
                if (!cache_exist(item))
                        goto top;
                }
                if (!cache_exist(item))