Changeset 2346

Timestamp:

Mar 27, 2019, 11:42:32 PM (6 years ago)

Author:

dmik

Message:

pthread: Implement key destructors.

Closes #182.

Location:

pthread/trunk/src

Files:

• my_os2key.c (modified) (3 diffs)
• my_os2thread.c (modified) (1 diff)
• pthread_private.h (modified) (1 diff)

pthread/trunk/src/my_os2key.c ¶

@@ -24 +24 @@
 #include <os2emx.h>
 
+#include <stdlib.h>
+
 #include "pthread.h"
 #include "tls.h"
 
+struct pthread_key_pair_t_
+{
+    pthread_key_t key;
+    void (*destructor)(void*);
+    struct pthread_key_pair_t_ *next;
+};
+
+typedef struct pthread_key_pair_t_ * pthread_key_pair_t;
+
+static pthread_key_pair_t pair_start = NULL;
+
 int pthread_key_create(pthread_key_t *key, void (*destructor)(void*))
 {
+    pthread_key_pair_t new_pair;
+
+    new_pair = calloc(1, sizeof(*new_pair));
+    if (new_pair == NULL) {
+        errno = ENOMEM;
+        return -1;
+    }
 
     if ((*(ULONG *)key = TlsAlloc()) != -1)
+    {
+        new_pair->key = *key;
+        new_pair->destructor = destructor;
+        new_pair->next = pair_start;
+
+        pair_start = new_pair;
+
         return 0;
+    }
+
+    free(new_pair);
+
     errno = EAGAIN;
     return -1;
@@ -38 +69 @@
 int pthread_key_delete(pthread_key_t key)
 {
+    pthread_key_pair_t prev = NULL;
+    pthread_key_pair_t pair;
+
+    for (pair = pair_start; pair != NULL; pair = pair->next) {
+        if (pair->key == key) {
+            if (pair == pair_start)
+                pair_start = pair->next;
+            else
+                prev->next = pair->next;
+
+            free(pair);
+            break;
+        }
+
+        prev = pair;
+    }
+
     if (TlsFree((ULONG)key))
         return 0;
@@ -57 +105 @@
 }
 
+void pthread_key_destructor(void)
+{
+    pthread_key_pair_t pair;
+
+    for (pair = pair_start; pair != NULL; pair = pair->next) {
+        void *value = pthread_getspecific(pair->key);
+
+        if (value != NULL && pair->destructor != NULL) {
+            pthread_setspecific(pair->key, NULL);
+            pair->destructor(value);
+        }
+    }
+}

pthread/trunk/src/my_os2thread.c ¶

@@ -189 +189 @@
                 pthread_setspecific(THR_self, NULL);
         }
+
+        // call all available destructors associated with all keys
+        pthread_key_destructor();
 
         // thread is joinable, pthread_join is supposed to be called from main thread

pthread/trunk/src/pthread_private.h ¶

@@ -87 +87 @@
 };
 
+void pthread_key_destructor(void);
+
 #ifdef __cplusplus
 } // extern "C"