Update.

1998-08-26 15:46  Ulrich Drepper  <drepper@cygnus.com>

	* internals.h: Define THREAD_GETMEM and THREAD_SETMEM to default if
	not already defined.
	(struct _pthread_descr_struct): Add p_self and p_nr field.
	* manager.c (__pthread_handles): Define second element to point
	to manager thread.
	(__pthread_handles_num): Initialize to 2.
	(__pthread_manager): Use INIT_THREAD_SELF with two arguments.
	(pthread_start_thread): Likewise.
	(pthread_handle_create): Start search for free slot at entry 2.
	Initialize new fields p_self and p_nr.
	Call __clone with CLONE_PTRACE if available.
	(pthread_free): Call FREE_THREAD_SELF if available.
	* pthread.c (__pthread_initial_thread): Initialize new fields.
	(__pthread_manager_thread): Likewise.
	(__pthread_initialize_manager): Call __clone with CLONE_PTRACE.

	* cancel.c: Use THREAD_GETMEM and THREAD_SETMEM to access the
	elements of the thread descriptor.
	* condvar.c: Likewise.
	* errno.c: Likewise.
	* join.c: Likewise.
	* manager.c: Likewise.
	* pthread.c: Likewise.
	* ptlongjmp.c: Likewise.
	* semaphore.c: Likewise.
	* signals.c: Likewise.
	* specific.c: Likewise.
	* spinlock.c: Likewise.

	* sysdeps/alpha/pt-machine.h (INIT_THREAD_SELF): Add extra parameter.

	* sysdeps/i386/useldt.h: New file.
	* sysdeps/i386/i686/pt-machine.h: Show how to use this file.

	* sysdeps/sparc/sparc32/pt-machine.h: Define THREAD_GETMEM and
	THREAD_SETMEM using __thread_self.
	* sysdeps/sparc/sparc64/pt-machine.h: Likewise.

1 files changed, 15 insertions, 13 deletions

diff --git a/linuxthreads/specific.c b/linuxthreads/specific.c
index 12990f4..4ebbad7 100644
--- a/linuxthreads/specific.c
+++ b/linuxthreads/specific.c
@@ -99,13 +99,13 @@ int __pthread_setspecific(pthread_key_t key, const void * pointer)
     return EINVAL;
   idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
   idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-  if (self->p_specific[idx1st] == NULL) {
-    self->p_specific[idx1st] =
-      calloc(PTHREAD_KEY_2NDLEVEL_SIZE, sizeof (void *));
-    if (self->p_specific[idx1st] == NULL)
+  if (THREAD_GETMEM(self, p_specific[idx1st]) == NULL) {
+    THREAD_SETMEM(self, p_specific[idx1st],
+		  calloc(PTHREAD_KEY_2NDLEVEL_SIZE, sizeof (void *)));
+    if (THREAD_GETMEM(self, p_specific[idx1st]) == NULL)
       return ENOMEM;
   }
-  self->p_specific[idx1st][idx2nd] = (void *) pointer;
+  THREAD_GETMEM(self, p_specific[idx1st])[idx2nd] = (void *) pointer;
   return 0;
 }
 weak_alias (__pthread_setspecific, pthread_setspecific)
@@ -121,9 +121,10 @@ void * __pthread_getspecific(pthread_key_t key)
     return NULL;
   idx1st = key / PTHREAD_KEY_2NDLEVEL_SIZE;
   idx2nd = key % PTHREAD_KEY_2NDLEVEL_SIZE;
-  if (self->p_specific[idx1st] == NULL || !pthread_keys[key].in_use)
+  if (THREAD_GETMEM(self, p_specific[idx1st]) == NULL
+      || !pthread_keys[key].in_use)
     return NULL;
-  return self->p_specific[idx1st][idx2nd];
+  return THREAD_GETMEM(self, p_specific[idx1st])[idx2nd];
 }
 weak_alias (__pthread_getspecific, pthread_getspecific)
 
@@ -141,19 +142,20 @@ void __pthread_destroy_specifics()
        round++) {
     found_nonzero = 0;
     for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++)
-      if (self->p_specific[i] != NULL)
+      if (THREAD_GETMEM(self, p_specific[i]) != NULL)
         for (j = 0; j < PTHREAD_KEY_2NDLEVEL_SIZE; j++) {
           destr = pthread_keys[i * PTHREAD_KEY_2NDLEVEL_SIZE + j].destr;
-          data = self->p_specific[i][j];
+          data = THREAD_GETMEM(self, p_specific[i])[j];
           if (destr != NULL && data != NULL) {
-            self->p_specific[i][j] = NULL;
+            THREAD_GETMEM(self, p_specific[i])[j] = NULL;
             destr(data);
             found_nonzero = 1;
           }
         }
   }
   for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) {
-    if (self->p_specific[i] != NULL) free(self->p_specific[i]);
+    if (THREAD_GETMEM(self, p_specific[i]) != NULL)
+      free(THREAD_GETMEM(self, p_specific[i]));
   }
 }
 
@@ -163,7 +165,7 @@ int __libc_internal_tsd_set(enum __libc_tsd_key_t key, const void * pointer)
 {
   pthread_descr self = thread_self();
 
-  self->p_libc_specific[key] = (void *) pointer;
+  THREAD_SETMEM(self, p_libc_specific[key], (void *) pointer);
   return 0;
 }
 
@@ -171,5 +173,5 @@ void * __libc_internal_tsd_get(enum __libc_tsd_key_t key)
 {
   pthread_descr self = thread_self();
 
-  return self->p_libc_specific[key];
+  return THREAD_GETMEM(self, p_libc_specific[key]);
 }