diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-11-06 12:59:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-11-06 12:59:44 +0100 |
| commit | e5642a3d703a9441efc68c8e05cd5534f867275f (patch) | |
| tree | 68b95e77b5edebf473fdda912ce31692ebd5d41a /libpthread | |
| parent | 916e61485d5434e0b4052832ca331cf0eb315538 (diff) | |
| parent | 25325144b5fcb0ec9ceec13cfc9131642ad074dc (diff) | |
Merge branch 'libpthread' into libpthread-moved
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/sysdeps/hurd/pt-destroy-specific.c | 2 | ||||
| -rw-r--r-- | libpthread/sysdeps/hurd/pt-key-delete.c | 19 | ||||
| -rw-r--r-- | libpthread/tests/Makefile | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/libpthread/sysdeps/hurd/pt-destroy-specific.c b/libpthread/sysdeps/hurd/pt-destroy-specific.c index 23c7fbc0..f7896e5e 100644 --- a/libpthread/sysdeps/hurd/pt-destroy-specific.c +++ b/libpthread/sysdeps/hurd/pt-destroy-specific.c @@ -48,7 +48,7 @@ __pthread_destroy_specific (struct __pthread *thread) void *value; if (__pthread_key_destructors[i] == PTHREAD_KEY_INVALID) - break; + continue; value = hurd_ihash_find (thread->thread_specifics, i); if (value) diff --git a/libpthread/sysdeps/hurd/pt-key-delete.c b/libpthread/sysdeps/hurd/pt-key-delete.c index 2426bb11..9d88647e 100644 --- a/libpthread/sysdeps/hurd/pt-key-delete.c +++ b/libpthread/sysdeps/hurd/pt-key-delete.c @@ -35,8 +35,27 @@ pthread_key_delete (pthread_key_t key) err = EINVAL; else { + int i; + __pthread_key_destructors[key] = PTHREAD_KEY_INVALID; __pthread_key_invalid_count ++; + + pthread_rwlock_rdlock (&__pthread_threads_lock); + for (i = 0; i < __pthread_num_threads; ++i) + { + struct __pthread *t; + + t = __pthread_threads[i]; + + if (t == NULL) + continue; + + /* Just remove the key, no need to care whether it was + already there. */ + if (t->thread_specifics) + hurd_ihash_remove (t->thread_specifics, key); + } + pthread_rwlock_unlock (&__pthread_threads_lock); } __pthread_mutex_unlock (&__pthread_key_lock); diff --git a/libpthread/tests/Makefile b/libpthread/tests/Makefile index 9509c957..5ebc01d3 100644 --- a/libpthread/tests/Makefile +++ b/libpthread/tests/Makefile @@ -4,7 +4,7 @@ LDLIBS = -lpthread CHECK_SRC := test-1.c test-2.c test-3.c test-6.c test-7.c test-8.c \ test-9.c test-10.c test-11.c test-12.c test-13.c test-14.c \ - test-15.c test-16.c + test-15.c test-16.c test-17.c test-__pthread_destroy_specific-skip.c CHECK_OBJS := $(addsuffix .o,$(basename $(notdir $(CHECK_SRC)))) CHECK_PROGS := $(basename $(notdir $(CHECK_SRC))) \ |