Changeset 1402

Timestamp:

Apr 29, 2004, 6:12:23 AM (21 years ago)

Author:

bird

Message:

More TLS.

Location:

trunk/src/emx

Files:

• include/InnoTekLIBC/thread.h (modified) (1 diff, 1 prop)
• src/lib/libc.def (modified) (1 diff, 1 prop)
• src/lib/process/tls.c (modified) (5 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/thread.h ¶

@@ -344 +344 @@
  *          this function. The result from doing that is undefined.
  */
-int     __libc_TLSDestructor(int iIndex, void (*pfnDestructor)(void *pvValue, unsigned fFlags), unsigned fFlags);
+int     __libc_TLSDestructor(int iIndex, void (*pfnDestructor)(void *pvValue, int iTLSIndex, unsigned fFlags), unsigned fFlags);
+
+
+/**
+ * Get pointer to the destructor function registered for the given TLS entry.
+ * 
+ * @returns NULL if invalid entry, errno set.
+ * @returns NULL if no entry registered.
+ * @returns Pointer to destructor if registered.
+ *
+ * @param   iTLSIndex       Value returned by __libc_TLSAlloc().
+ * @param   pfFlags         Where to store the flags supplied to __libc_TLSDestructor().
+ *                          NULL is ok.
+ */
+void (*__libc_TLSGetDestructor(int iTLSIndex, unsigned *pfFlags))(void *, int, unsigned);
 
 /** @} */

trunk/src/emx/src/lib/libc.def ¶

@@ -1097 +1097 @@
     "___libc_TLSDestructor" @1119
     "___libc_ThreadRegisterTermCallback" @1120
+    "___libc_TLSGetDestructor" @1121

trunk/src/emx/src/lib/process/tls.c ¶

@@ -69 +69 @@
 
 /** TLS Per Thread Destructors. */
-static   void (*gapfnDestructors[__LIBC_TLS_MAX])(void *, unsigned);
+static   void (*gapfnDestructors[__LIBC_TLS_MAX])(void *, int, unsigned);
 
 /** Thread Termination Registration Record. */
@@ -157 +157 @@
      */
     gapfnDestructors[iIndex] = NULL;
+    /* @todo do serialized NULLing of all threads! */
     __atomic_clear_bit(&gauBitmap[0], iIndex);
 
@@ -216 +217 @@
 
 
-int     __libc_TLSDestructor(int iIndex, void (*pfnDestructor)(void *pvValue, unsigned fFlags), unsigned fFlags)
+int     __libc_TLSDestructor(int iIndex, void (*pfnDestructor)(void *pvValue, int iTLSIndex, unsigned fFlags), unsigned fFlags)
 {
     LIBCLOG_ENTER("iIndex=%d pfnDestructor=%p\n", iIndex, pfnDestructor);
@@ -302 +303 @@
                     while (k < kEnd)
                     {
-                        void (*pfnDestructor)(void *, unsigned);
+                        void (*pfnDestructor)(void *, int, unsigned);
+                        void  *pvValue;
                         if (    __atomic_test_bit(&gauBitmap[0], k)    
                             &&  k < __LIBC_TLS_MAX
-                            &&  pThrd->apvTLS[k]
+                            &&  (pvValue = pThrd->apvTLS[k]) != NULL
                             &&  (pfnDestructor = gapfnDestructors[k]) != NULL)
                         {
                             LIBCLOG_MSG("tls %d: calling %p with %p\n", k, (void *)pfnDestructor, pThrd->apvTLS[k]);
-                            pfnDestructor(pThrd->apvTLS[k], fFlags);
+                            pThrd->apvTLS[k] = NULL;
+                            pfnDestructor(pvValue, k, fFlags);
                         }
 
@@ -321 +324 @@
     LIBCLOG_RETURN_VOID();
 }
+
+
+void (*__libc_TLSGetDestructor(int iTLSIndex, unsigned *pfFlags))(void *, int, unsigned)
+{
+    LIBCLOG_ENTER("iTLSIndex=%d, pfFlags=%p\n", iTLSIndex, pfFlags);
+    void (*pfnDestructor)(void *, int, unsigned);
+
+    /*
+     * Validate index
+     */
+    if (    iTLSIndex < 0
+        ||  iTLSIndex >= __LIBC_TLS_MAX
+        ||  !__atomic_test_bit(&gauBitmap[0], iTLSIndex)
+            )
+    {
+        LIBC_ASSERTM_FAILED("Bad index %d. (max=%d)\n", iTLSIndex, __LIBC_TLS_MAX);
+        errno = EINVAL;
+        LIBCLOG_RETURN_P(NULL);
+    }
+
+    pfnDestructor = gapfnDestructors[iTLSIndex];
+    if (pfFlags)
+        *pfFlags = 0;
+    LIBCLOG_RETURN_P(pfnDestructor);
+}