cache: Simplify locking mechanics

The object cache is mostly IO-bound, so it makes no sense to have a lock
per node.

1 files changed, 6 insertions, 16 deletions

diff --git a/src/cache.h b/src/cache.h
index 8c885d9a5..688f14559 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -23,42 +23,32 @@ typedef struct {
 } git_cached_obj;
 
 typedef struct {
-	git_cached_obj *ptr;
+	git_cached_obj **nodes;
 	git_mutex lock;
-} cache_node;
-
-typedef struct {
-	cache_node *nodes;
 
 	unsigned int lru_count;
 	size_t size_mask;
 	git_cached_obj_freeptr free_obj;
 } git_cache;
 
-
 int git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr);
 void git_cache_free(git_cache *cache);
 
 void *git_cache_try_store(git_cache *cache, void *entry);
 void *git_cache_get(git_cache *cache, const git_oid *oid);
 
-
-GIT_INLINE(int) git_cached_obj_compare(git_cached_obj *obj, const git_oid *oid)
-{
-	return git_oid_cmp(&obj->oid, oid);
-}
-
-GIT_INLINE(void) git_cached_obj_incref(git_cached_obj *obj)
+GIT_INLINE(void) git_cached_obj_incref(void *_obj)
 {
+	git_cached_obj *obj = _obj;
 	git_atomic_inc(&obj->refcount);
 }
 
-GIT_INLINE(void) git_cached_obj_decref(git_cached_obj *obj, git_cached_obj_freeptr free_obj)
+GIT_INLINE(void) git_cached_obj_decref(void *_obj, git_cached_obj_freeptr free_obj)
 {
+	git_cached_obj *obj = _obj;
+
 	if (git_atomic_dec(&obj->refcount) == 0)
 		free_obj(obj);
 }
 
-
-
 #endif