From 137028b4d7e50f71906c1656c27079eac5a1d085 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Thu, 16 Jul 2009 10:10:10 -0700 Subject: Fix lock handling in memory hander of nscd. The commit 20e498bd removes the pthread_mutex_rdlock() calls, but not the corresponding pthread_mutex_unlock() calls. Also, the database lock is never unlocked in one branch of the mempool_alloc() if. I think unreproducible random assert(dh->usable) crashes in prune_cache() were caused by this. But an easy way to make nscd threads hang with the broken locking was. --- nscd/servicescache.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nscd/servicescache.c') diff --git a/nscd/servicescache.c b/nscd/servicescache.c index dc98d30..c965c97 100644 --- a/nscd/servicescache.c +++ b/nscd/servicescache.c @@ -136,8 +136,6 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, (void) cache_add (req->type, &dataset->strdata, req->key_len, &dataset->head, true, db, owner, he == NULL); - pthread_rwlock_unlock (&db->lock); - /* Mark the old entry as obsolete. */ if (dh != NULL) dh->usable = false; @@ -317,8 +315,6 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req, (void) cache_add (req->type, key_copy, req->key_len, &dataset->head, true, db, owner, he == NULL); - - pthread_rwlock_unlock (&db->lock); } } -- cgit v1.1