Fix memory leak of thread local storage.

Author: PengZheng

libs/error_injector/pthread/CMakeLists.txt

@@ -29,5 +29,6 @@ target_link_options(pthread_ei INTERFACE
         LINKER:--wrap,pthread_condattr_setpshared
         LINKER:--wrap,pthread_cond_init
         LINKER:--wrap,pthread_cond_timedwait
+        LINKER:--wrap,pthread_key_create
         )
 add_library(Celix::pthread_ei ALIAS pthread_ei)

libs/error_injector/pthread/include/pthread_ei.h

@@ -40,6 +40,8 @@ CELIX_EI_DECLARE(pthread_cond_init, int);
 
 CELIX_EI_DECLARE(pthread_cond_timedwait, int);
 
+CELIX_EI_DECLARE(pthread_key_create, int);
+
 #ifdef __cplusplus
 }
 #endif

libs/error_injector/pthread/src/pthread_ei.cc

@@ -76,4 +76,11 @@ int __wrap_pthread_cond_timedwait(pthread_cond_t * __cond, pthread_mutex_t * __m
     return __real_pthread_cond_timedwait(__cond, __mutex, __abstime);
 }
 
+int __real_pthread_key_create(pthread_key_t * __key, void (*__destr_function)(void *));
+CELIX_EI_DEFINE(pthread_key_create, int)
+int __wrap_pthread_key_create(pthread_key_t * __key, void (*__destr_function)(void *)) {
+    CELIX_EI_IMPL(pthread_key_create);
+    return __real_pthread_key_create(__key, __destr_function);
+}
+
 }

libs/utils/gtest/CMakeLists.txt

@@ -113,7 +113,7 @@ if (EI_TESTS)
     )
     target_link_libraries(test_utils_celix_err_key_create_with_ei PRIVATE
             utils_err_no_ctor_dtor_cut
-            Celix::uv_ei
+            Celix::pthread_ei
             GTest::gtest GTest::gtest_main
     )
     add_test(NAME test_utils_celix_err_key_create_with_ei COMMAND test_utils_celix_err_key_create_with_ei)

libs/utils/gtest/src/ErrKeyCreateErrorInjectionTestSuite.cc

@@ -21,25 +21,25 @@
 
 #include "celix_err.h"
 #include "celix_err_private.h"
-#include "uv_ei.h"
+#include "pthread_ei.h"
 
 class ErrKeyCreateErrorInjectionTestSuite : public ::testing::Test {
 public:
     ErrKeyCreateErrorInjectionTestSuite() = default;
 
     ~ErrKeyCreateErrorInjectionTestSuite() noexcept override {
-        celix_ei_expect_uv_key_create(nullptr, 0, 0);
+        celix_ei_expect_pthread_key_create(nullptr, 0, 0);
     }
 };
 
 TEST_F(ErrKeyCreateErrorInjectionTestSuite, InitThreadStorageKeyFailureAndSuccess) {
-    celix_ei_expect_uv_key_create((void*)celix_err_initThreadSpecificStorageKey, 0, -1);
+    celix_ei_expect_pthread_key_create((void*)celix_err_initThreadSpecificStorageKey, 0, -1);
     celix_err_initThreadSpecificStorageKey();
 
     celix_err_push("error message");
     EXPECT_EQ(0, celix_err_getErrorCount());
 
-    celix_ei_expect_uv_key_create(nullptr, 0, 0);
+    celix_ei_expect_pthread_key_create(nullptr, 0, 0);
     celix_err_initThreadSpecificStorageKey();
     celix_err_resetErrors();
     celix_err_push("error message");

libs/utils/src/celix_err.c

@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <pthread.h>
 #include <uv.h>
 
 
@@ -44,6 +45,13 @@ typedef struct celix_err {
 uv_key_t celix_err_tssKey;
 bool celix_err_tssKeyInitialized = false;
 
+static void celix_err_destroyTssErr(void* data) {
+    celix_err_t* err = data;
+    if (err != NULL) {
+        free(err);
+    }
+}
+
 static celix_err_t* celix_err_getRawTssErr() {
     if (!celix_err_tssKeyInitialized) {
         return NULL;
@@ -77,11 +85,11 @@ CELIX_ERR_CONSTRUCTOR void celix_err_initThreadSpecificStorageKey() {
     if (celix_err_tssKeyInitialized) {
         return;
     }
-    int rc = uv_key_create(&celix_err_tssKey);
+    int rc = pthread_key_create(&celix_err_tssKey, celix_err_destroyTssErr);
     if (rc == 0) {
         celix_err_tssKeyInitialized = true;
     } else {
-        fprintf(stderr,"Failed to create thread specific storage key for celix_err\n");
+        fprintf(stderr,"Failed to create thread specific storage key for celix_err %d\n", rc);
     }
 }