AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix lock handling in memory hander of nscd."

Browse Source 
This reverts commit 137028b4d7.

Conflicts:

	ChangeLog
This commit is contained in:
Ulrich Drepper 2009-07-17 07:49:16 -07:00
parent 09f97a8fbf
commit 00ebd7ed58
8 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -4,17 +4,6 @@
* resolv/res-mkquery.c (__res_nopt): If anslen is > 0xffff store * resolv/res-mkquery.c (__res_nopt): If anslen is > 0xffff store
0xffff in the EDNS0 record. 0xffff in the EDNS0 record.
2009-07-16 Petr Baudis <pasky@suse.cz>
[BZ #10402]
* nscd/mem.c (mempool_alloc): Fix unlock missing in the else branch.
* nscd/aicache.c: Remove bogus db->lock unlock.
* nscd/grpcache.c: Likewise.
* nscd/hstcache.c: Likewise.
* nscd/initgrcache.c: Likewise.
* nscd/pwdcache.c: Likewise.
* nscd/servicescache.c: Likewise.
2009-07-16 Ulrich Drepper <drepper@redhat.com> 2009-07-16 Ulrich Drepper <drepper@redhat.com>
* nscd/cache.c (cache_add): Use atomic_compare_and_exchange_bool_rel * nscd/cache.c (cache_add): Use atomic_compare_and_exchange_bool_rel

2
nscd/aicache.c
View File

@ -543,6 +543,8 @@ next_nip:
(void) cache_add (req->type, key_copy, req->key_len, &dataset->head, (void) cache_add (req->type, key_copy, req->key_len, &dataset->head,
true, db, uid, he == NULL); true, db, uid, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;

6
nscd/grpcache.c
View File

@ -146,6 +146,8 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, req->key_len, (void) cache_add (req->type, &dataset->strdata, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -365,10 +367,12 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (GETGRBYGID, cp, key_offset, &dataset->head, (void) cache_add (GETGRBYGID, cp, key_offset, &dataset->head,
false, db, owner, false); false, db, owner, false);
} }
out:
pthread_rwlock_unlock (&db->lock);
} }
} }
out:
if (__builtin_expect (written != total, 0) && debug_level > 0) if (__builtin_expect (written != total, 0) && debug_level > 0)
{ {
char buf[256]; char buf[256];

4
nscd/hstcache.c
View File

@ -153,6 +153,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, req->key_len, (void) cache_add (req->type, &dataset->strdata, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -402,6 +404,8 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
} }
} }

4
nscd/initgrcache.c
View File

@ -230,6 +230,8 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, uid, he == NULL); &dataset->head, true, db, uid, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -386,6 +388,8 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (INITGROUPS, cp, req->key_len, &dataset->head, true, (void) cache_add (INITGROUPS, cp, req->key_len, &dataset->head, true,
db, uid, he == NULL); db, uid, he == NULL);
pthread_rwlock_unlock (&db->lock);
} }
} }

6
nscd/mem.c
View File

@ -566,6 +566,9 @@ mempool_alloc (struct database_dyn *db, size_t len, int data_alloc)
} }
} }
if (data_alloc)
pthread_rwlock_unlock (&db->lock);
if (! db->last_alloc_failed) if (! db->last_alloc_failed)
{ {
dbg_log (_("no more memory for database '%s'"), dbnames[db - dbs]); dbg_log (_("no more memory for database '%s'"), dbnames[db - dbs]);
@ -588,8 +591,5 @@ mempool_alloc (struct database_dyn *db, size_t len, int data_alloc)
pthread_mutex_unlock (&db->memlock); pthread_mutex_unlock (&db->memlock);
if (data_alloc)
pthread_rwlock_unlock (&db->lock);
return res; return res;
} }

6
nscd/pwdcache.c
View File

@ -153,6 +153,8 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -360,10 +362,12 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (GETPWBYUID, cp, key_offset, &dataset->head, (void) cache_add (GETPWBYUID, cp, key_offset, &dataset->head,
false, db, owner, false); false, db, owner, false);
} }
out:
pthread_rwlock_unlock (&db->lock);
} }
} }
out:
if (__builtin_expect (written != total, 0) && debug_level > 0) if (__builtin_expect (written != total, 0) && debug_level > 0)
{ {
char buf[256]; char buf[256];

4
nscd/servicescache.c
View File

@ -136,6 +136,8 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, &dataset->strdata, req->key_len, (void) cache_add (req->type, &dataset->strdata, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
/* Mark the old entry as obsolete. */ /* Mark the old entry as obsolete. */
if (dh != NULL) if (dh != NULL)
dh->usable = false; dh->usable = false;
@ -315,6 +317,8 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
(void) cache_add (req->type, key_copy, req->key_len, (void) cache_add (req->type, key_copy, req->key_len,
&dataset->head, true, db, owner, he == NULL); &dataset->head, true, db, owner, he == NULL);
pthread_rwlock_unlock (&db->lock);
} }
} }