summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--sysdeps/hurd/pt-destroy-specific.c6
-rw-r--r--sysdeps/hurd/pt-getspecific.c2
-rw-r--r--sysdeps/hurd/pt-key.h2
-rw-r--r--sysdeps/hurd/pt-setspecific.c4
5 files changed, 21 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f2b8e5c..2ff95f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-08-17 Marcus Brinkmann <marcus@gnu.org>
+
+ * sysdeps/hurd/pt-key.h (PTHREAD_KEY_MEMBERS): Change type of
+ THREAD_SPECIFICS to hurd_ihash_t.
+ * sysdeps/hurd/pt-setspecific.c (pthread_setspecific): Call
+ hurd_ihash_create instead ihash_create, and hurd_ihash_add instead
+ ihash_add.
+ * sysdeps/hurd/pt-getspecific.c (pthread_getspecific): Call
+ hurd_ihash_find instead of ihash_find.
+ * sysdeps/hurd/pt-destroy-specific.c (__pthread_destroy_specific):
+ Call hurd_ihash_find instead of ihash_find, hurd_ihash_remove
+ instead of ihash_remove, and hurd_ihash_free instead of
+ ihash_free.
+
2003-08-03 Marco Gerards <metgerards@student.han.nl>
* Makefile (install): Do not install from $(srcdir).
diff --git a/sysdeps/hurd/pt-destroy-specific.c b/sysdeps/hurd/pt-destroy-specific.c
index dbd3314..23c7fbc 100644
--- a/sysdeps/hurd/pt-destroy-specific.c
+++ b/sysdeps/hurd/pt-destroy-specific.c
@@ -50,10 +50,10 @@ __pthread_destroy_specific (struct __pthread *thread)
if (__pthread_key_destructors[i] == PTHREAD_KEY_INVALID)
break;
- value = ihash_find (thread->thread_specifics, i);
+ value = hurd_ihash_find (thread->thread_specifics, i);
if (value)
{
- err = ihash_remove (thread->thread_specifics, i);
+ err = hurd_ihash_remove (thread->thread_specifics, i);
assert (err == 1);
if (__pthread_key_destructors[i])
@@ -74,6 +74,6 @@ __pthread_destroy_specific (struct __pthread *thread)
sched_yield ();
}
- ihash_free (thread->thread_specifics);
+ hurd_ihash_free (thread->thread_specifics);
thread->thread_specifics = 0;
}
diff --git a/sysdeps/hurd/pt-getspecific.c b/sysdeps/hurd/pt-getspecific.c
index b5b5f5e..3060598 100644
--- a/sysdeps/hurd/pt-getspecific.c
+++ b/sysdeps/hurd/pt-getspecific.c
@@ -33,5 +33,5 @@ pthread_getspecific (pthread_key_t key)
if (! self->thread_specifics)
return 0;
- return ihash_find (self->thread_specifics, key);
+ return hurd_ihash_find (self->thread_specifics, key);
}
diff --git a/sysdeps/hurd/pt-key.h b/sysdeps/hurd/pt-key.h
index 739fbba..494e01d 100644
--- a/sysdeps/hurd/pt-key.h
+++ b/sysdeps/hurd/pt-key.h
@@ -21,7 +21,7 @@
#include <hurd/ihash.h>
#define PTHREAD_KEY_MEMBERS \
- ihash_t thread_specifics;
+ hurd_ihash_t thread_specifics;
#define PTHREAD_KEY_INVALID (void *) (-1)
diff --git a/sysdeps/hurd/pt-setspecific.c b/sysdeps/hurd/pt-setspecific.c
index bd75225..89ca4d7 100644
--- a/sysdeps/hurd/pt-setspecific.c
+++ b/sysdeps/hurd/pt-setspecific.c
@@ -30,12 +30,12 @@ pthread_setspecific (pthread_key_t key, const void *value)
if (! self->thread_specifics)
{
- err = ihash_create (&self->thread_specifics);
+ err = hurd_ihash_create (&self->thread_specifics, HURD_IHASH_NO_LOCP);
if (err)
return ENOMEM;
}
- err = ihash_add (self->thread_specifics, key, (void *) value, 0);
+ err = hurd_ihash_add (self->thread_specifics, key, (void *) value);
if (err)
return ENOMEM;