Make a number of improvements to cache handling.

- Items that are too big for the cache are now no longer immediately
  evicted; everything else is. This is probably not desirable, but it is
  not unexpected.
- Multithreading now should work as expected; DbRefs are locked before
  they are updated from the disk, and they are not evicted from the cache
  if they are locked by another thread.
- The cache may be no smaller than 1024 bytes. Previously the caller of
  DbOpen() could choose to disable the cache, and provisions were made in
  the code to support this, but this is now no longer possible because
  without the cache, there would be no way to know what files were open,
  which could lead to a race condition if two threads open the same file.

src/Db.c

@@ -185,26 +185,46 @@ static void
 DbCacheEvict(Db * db)
 {
     DbRef *ref = db->leastRecent;
+    DbRef *tmp;
 
     while (ref && db->cacheSize > db->maxCache)
     {
         char *hash = DbHashKey(ref->prefix, ref->key);
 
+        if (pthread_mutex_trylock(&ref->lock) != 0)
+        {
+            /* This ref is locked by another thread, don't evict it. */
+            ref = ref->next;
+            continue;
+        }
+
         JsonFree(ref->json);
+        pthread_mutex_unlock(&ref->lock);
         pthread_mutex_destroy(&ref->lock);
 
+        hash = DbHashKey(ref->prefix, ref->key);
         HashMapDelete(db->cache, hash);
         Free(hash);
+
         Free(ref->prefix);
         Free(ref->key);
 
         db->cacheSize -= ref->size;
-        db->leastRecent = ref->next;
-        db->leastRecent->prev = NULL;
 
+        ref->next->prev = ref->prev;
+        if (!ref->prev)
+        {
+            db->leastRecent = ref->next;
+        }
+        else
+        {
+            ref->prev->next = ref->next;
+        }
+
+        tmp = ref->next;
         Free(ref);
 
-        ref = db->leastRecent;
+        ref = tmp;
     }
 }
 
@@ -213,7 +233,7 @@ DbOpen(char *dir, size_t cache)
 {
     Db *db;
 
-    if (!dir)
+    if (!dir || cache < 1024)
     {
         return NULL;
     }
@@ -229,17 +249,10 @@ DbOpen(char *dir, size_t cache)
 
     pthread_mutex_init(&db->lock, NULL);
 
-    if (db->maxCache)
+    db->cache = HashMapCreate();
+    if (!db->cache)
     {
-        db->cache = HashMapCreate();
+        return NULL;
-        if (!db->cache)
-        {
-            return NULL;
-        }
-    }
-    else
-    {
-        db->cache = NULL;
     }
 
     db->mostRecent = NULL;
@@ -329,18 +342,16 @@ DbLock(Db * db, char *prefix, char *key)
     pthread_mutex_lock(&db->lock);
 
     /* Check if the item is in the cache */
-    if (db->cache)
+    hash = DbHashKey(prefix, key);
-    {
+    ref = HashMapGet(db->cache, hash);
-        hash = DbHashKey(prefix, key);
-        ref = HashMapGet(db->cache, hash);
-    }
-
     file = DbFileName(db, prefix, key);
 
     if (ref)                       /* In cache */
     {
         unsigned long diskTs = UtilLastModified(file);
 
+        pthread_mutex_lock(&ref->lock);
+
         if (diskTs > ref->ts)
         {
             /* File was modified on disk since it was cached */
@@ -349,6 +360,7 @@ DbLock(Db * db, char *prefix, char *key)
 
             if (!fp)
             {
+                pthread_mutex_unlock(&ref->lock);
                 ref = NULL;
                 goto finish;
             }
@@ -358,6 +370,7 @@ DbLock(Db * db, char *prefix, char *key)
 
             if (!json)
             {
+                pthread_mutex_unlock(&ref->lock);
                 ref = NULL;
                 goto finish;
             }
@@ -367,29 +380,25 @@ DbLock(Db * db, char *prefix, char *key)
             ref->ts = diskTs;
             ref->size = DbComputeSize(ref->json);
 
-            if (db->cache)
+            /* Float this ref to mostRecent */
+            if (ref->next)
             {
-                /* Float this ref to mostRecent */
+                ref->next->prev = ref->prev;
-                if (ref->next)
+                ref->prev->next = ref->next;
+
+                if (!ref->prev)
                 {
-                    ref->next->prev = ref->prev;
+                    db->leastRecent = ref->next;
-                    ref->prev->next = ref->next;
-
-                    if (!ref->prev)
-                    {
-                        db->leastRecent = ref->next;
-                    }
-
-                    ref->prev = db->mostRecent;
-                    ref->next = NULL;
-                    db->mostRecent = ref;
                 }
 
-                /* The file on disk may be larger than what we have in
+                ref->prev = db->mostRecent;
-                 * memory, which may require items in cache to be
+                ref->next = NULL;
-                 * evicted. */
+                db->mostRecent = ref;
-                DbCacheEvict(db);
             }
+
+            /* The file on disk may be larger than what we have in
+             * memory, which may require items in cache to be evicted. */
+            DbCacheEvict(db);
         }
     }
     else
@@ -421,29 +430,25 @@ DbLock(Db * db, char *prefix, char *key)
         }
 
         pthread_mutex_init(&ref->lock, NULL);
+        pthread_mutex_lock(&ref->lock);
+
         ref->ts = UtilServerTs();
         ref->size = DbComputeSize(ref->json);
         ref->prefix = UtilStringDuplicate(prefix);
         ref->key = UtilStringDuplicate(key);
 
-        /* If cache is enabled, cache this ref */
+        HashMapSet(db->cache, hash, ref);
-        if (db->cache)
+        db->cacheSize += ref->size;
-        {
-            HashMapSet(db->cache, hash, ref);
-            db->cacheSize += ref->size;
 
-            ref->next = NULL;
+        ref->next = NULL;
-            ref->prev = db->mostRecent;
+        ref->prev = db->mostRecent;
-            db->mostRecent = ref;
+        db->mostRecent = ref;
 
-            /* Adding this item to the cache may case it to grow too
+        /* Adding this item to the cache may case it to grow too large,
-             * large, requiring some items to be evicted */
+         * requiring some items to be evicted */
-            DbCacheEvict(db);
+        DbCacheEvict(db);
-        }
     }
 
-    pthread_mutex_lock(&ref->lock);
-
 finish:
     pthread_mutex_unlock(&db->lock);
 
@@ -480,29 +485,17 @@ DbUnlock(Db * db, DbRef * ref)
     fflush(fp);
     fclose(fp);
 
+
+    db->cacheSize -= ref->size;
+    ref->size = DbComputeSize(ref->json);
+    db->cacheSize += ref->size;
+
     pthread_mutex_unlock(&ref->lock);
 
-    /* No cache, free it now */
+    /* If this ref has grown significantly since we last computed its
-    if (!db->cache)
+     * size, it may have filled the cache and require some items to be
-    {
+     * evicted. */
-        JsonFree(ref->json);
+    DbCacheEvict(db);
-        Free(ref->prefix);
-        Free(ref->key);
-        pthread_mutex_destroy(&ref->lock);
-        Free(ref);
-    }
-    else
-    {
-        /* This ref should be in the cache, just update it's size */
-        db->cacheSize -= ref->size;
-        ref->size = DbComputeSize(ref->json);
-        db->cacheSize += ref->size;
-
-        /* If this ref has grown significantly since we last computed
-         * its size, it may have filled the cache and require some
-         * items to be evicted. */
-        DbCacheEvict(db);
-    }
 
     pthread_mutex_unlock(&db->lock);
     return 1;