Changeset 1404

Timestamp:

Apr 29, 2004, 6:33:48 AM (21 years ago)

Author:

bird

Message:

#967: rewrote to use the LIBC TLS API.

File:

• trunk/src/gcc/gcc/gthr-os2.h (modified) (8 diffs, 1 prop)

trunk/src/gcc/gcc/gthr-os2.h

@@ -30 +30 @@
 #define __gthr_os2_h
 
-/* The __MT__ symbol should be defined for multiple threads (-Zmt) */
-#ifdef __MT__
+#ifdef _LIBOBJC
+#error "gthr-os2.h doesn't implement the _LIBOBJC mode!"
+#endif 
 
 #define __GTHREADS 1
@@ -41 +42 @@
 #include <malloc.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <InnoTekLIBC/thread.h>
 
-typedef struct
-{
-  void *thread_data;
-  void (*thread_dtor) (void *);
-} __gthread_key_struct_t;
-
-typedef __gthread_key_struct_t *__gthread_key_t;
+typedef int __gthread_key_t;
 typedef volatile signed char __gthread_once_t;
 typedef _fmutex __gthread_mutex_t;
@@ -64 +61 @@
 __gthread_once (__gthread_once_t *once, void (*func) (void))
 {
+  if (once == NULL || func == NULL)
+      return EINVAL;
   if (__cxchg (once, 1) == 0)
     func ();
@@ -93 +92 @@
 }
 
-#ifdef __cplusplus
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C extern
-#endif
-
-/** r=bird: We really should make a set of TLS functions for this stuff as
- *          the thread local memory is a very limited resource.
- */
-/* rather than including os2.h we'll define the prototype here... */
-EXTERN_C unsigned long _System DosAllocThreadLocalMemory (unsigned long dwords,
-  unsigned long **ptr);
-EXTERN_C unsigned long _System DosFreeThreadLocalMemory (unsigned long *ptr);
-
-#undef EXTERN_C
-
-/* @@@BUG: dtor is NEVER called when the thread exits; todo: modify EMX
-   libc so that we have separate storage in current thread structure and
-   _endthread() calls all the destructors we assign here... */
 static inline int
 __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
 {
-  if (DosAllocThreadLocalMemory ((sizeof (__gthread_key_struct_t) + 3)/4,
-        (unsigned long **)key))
-    return -1;
-
-  (*key)->thread_data = NULL;
-  (*key)->thread_dtor = dtor;
-  return 0;
+    int iTLS = __libc_TLSAlloc();
+    if (iTLS < 0)
+        return errno;
+    __libc_TLSDestructor(iTLS, (void (*)(void *, int, unsigned))dtor, 0);
+    *key = iTLS;
+    return 0;
 }
 
@@ -127 +106 @@
 __gthread_key_dtor (__gthread_key_t key, void *ptr)
 {
-  key->thread_dtor (ptr);
-  key->thread_dtor = NULL;
-  return 0;
+    void (*pfnDestructor)(void *pvValue, int iTLSIndex, unsigned fFlags) = __libc_TLSGetDestructor(key, NULL);
+    if (pfnDestructor)
+    {
+        pfnDestructor(ptr, key, 0);
+        __libc_TLSSet(key, NULL);
+    }
+    return 0;
 }
 
@@ -135 +118 @@
 __gthread_key_delete (__gthread_key_t key)
 {
-  return DosFreeThreadLocalMemory ((unsigned long *)key);
+    if (__libc_TLSFree(key))
+        return errno;
+    return 0;
 }
 
@@ -141 +126 @@
 __gthread_getspecific (__gthread_key_t key)
 {
-  return key->thread_data;
+    return __libc_TLSGet(key);
 }
 
@@ -147 +132 @@
 __gthread_setspecific (__gthread_key_t key, const void *ptr)
 {
-  key->thread_data = (void *)ptr;
-  return 0;
+    if (__libc_TLSSet(key, (void *)ptr))
+        return errno;
+    return 0;
 }
 
-#else /* __MT__ */
-
-#include "gthr-single.h"
-
-#endif /* __MT__ */
-
 #endif /* not __gthr_os2_h */