Changeset 2699 for branches

Timestamp:

May 28, 2006, 11:26:36 PM (19 years ago)

Author:

bird

Message:

Fixes #109. This also fixes a bug in the ghtread_once implementation where any racing thread didn't stop and wait.

File:

• branches/libc-0.6/src/gcc/gcc/gthr-os2.h (modified) (7 diffs)

branches/libc-0.6/src/gcc/gcc/gthr-os2.h

@@ -44 +44 @@
 #include <errno.h>
 #include <InnoTekLIBC/thread.h>
+#include <InnoTekLIBC/backend.h>
 
 typedef int __gthread_key_t;
-typedef volatile signed char __gthread_once_t;
+typedef struct 
+{
+  signed char volatile done;
+  signed char volatile started;
+} __gthread_once_t;
 typedef _fmutex __gthread_mutex_t;
 
-#define __GTHREAD_ONCE_INIT             0
+#define __GTHREAD_ONCE_INIT             { 0, 0 }
 #define __GTHREAD_MUTEX_INIT_FUNCTION   __gthread_mutex_init_function
 
@@ -63 +68 @@
   if (once == NULL || func == NULL)
       return EINVAL;
-  if (__cxchg (once, 1) == 0)
-    func ();
+  if (__cxchg (&once->started, 1) == 0)
+    {
+      func ();
+      __cxchg (&once->done, 1);
+    }
+  else if (!once->done)
+    {
+      unsigned outer = 0;
+      do
+        {
+          int i = 4096;
+          while (i-- > 0 && !once->done)
+            __libc_Back_threadSleep(0, NULL);
+          if (once->done)
+            break;
+          __libc_Back_threadSleep(++outer % 32, NULL);
+        } 
+      while (!once->done);
+    }
   return 0;
 }
@@ -95 +117 @@
 __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
 {
-    int iTLS = __libc_TLSAlloc();
-    if (iTLS < 0)
-        return errno;
-    __libc_TLSDestructor(iTLS, (void (*)(void *, int, unsigned))dtor, 0);
-    *key = iTLS;
-    return 0;
+  int iTLS = __libc_TLSAlloc ();
+  if (iTLS < 0)
+    return errno;
+  __libc_TLSDestructor (iTLS, (void (*)(void *, int, unsigned))dtor, 0);
+  *key = iTLS;
+  return 0;
 }
 
@@ -106 +128 @@
 __gthread_key_dtor (__gthread_key_t key, void *ptr)
 {
-    void (*pfnDestructor)(void *pvValue, int iTLSIndex, unsigned fFlags) = __libc_TLSGetDestructor(key, NULL);
-    if (pfnDestructor)
-    {
-        pfnDestructor(ptr, key, 0);
-        __libc_TLSSet(key, NULL);
-    }
-    return 0;
+  if (__libc_TLSSet (key, NULL))
+    return errno;
+  return 0;
 }
 
@@ -118 +136 @@
 __gthread_key_delete (__gthread_key_t key)
 {
-    if (__libc_TLSFree(key))
-        return errno;
-    return 0;
+  if (__libc_TLSFree (key))
+    return errno;
+  return 0;
 }
 
@@ -126 +144 @@
 __gthread_getspecific (__gthread_key_t key)
 {
-    return __libc_TLSGet(key);
+  return __libc_TLSGet (key);
 }
 
@@ -132 +150 @@
 __gthread_setspecific (__gthread_key_t key, const void *ptr)
 {
-    if (__libc_TLSSet(key, (void *)ptr))
-        return errno;
-    return 0;
+  if (__libc_TLSSet (key, (void *)ptr))
+    return errno;
+  return 0;
 }