[celix] 03/04: Add __thread base alternative impl for celix_err

[pnoltes]

This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/celix_err
in repository https://gitbox.apache.org/repos/asf/celix.git

commit d690d06346b3e8c04cf78b665f0acd0f19d5a82b
Author: Pepijn Noltes <pepijnnol...@gmail.com>
AuthorDate: Tue May 2 17:04:36 2023 +0200

    Add __thread base alternative impl for celix_err
---
 libs/utils/src/celix_err.c | 50 +++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/libs/utils/src/celix_err.c b/libs/utils/src/celix_err.c
index e5c55bf2..0f40ebfb 100644
--- a/libs/utils/src/celix_err.c
+++ b/libs/utils/src/celix_err.c
@@ -23,9 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef CELIX_ERR_USE_THREAD_LOCAL
+#ifndef CELIX_ERR_USE_THREAD_LOCAL
 #include <stdlib.h>
-
 #include "celix_threads.h"
 #endif
 
@@ -35,7 +34,18 @@ typedef struct celix_err {
 } celix_err_t;
 
 #ifdef CELIX_ERR_USE_THREAD_LOCAL
+
+__thread celix_err_t celix_err_tssErr = { .buffer = {0}, .pos = 0 };
+
+static celix_err_t* celix_err_getTssErr() {
+    return &celix_err_tssErr;
+}
+
+#else //Use TSS
+
 celix_tss_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) {
@@ -43,7 +53,12 @@ static void celix_err_destroyTssErr(void* data) {
     }
 }
 
-static celix_err_t* celix_err_getTssErr() {
+celix_err_t* celix_err_getTssErr() {
+    if (!celix_err_tssKeyInitialized) {
+        fprintf(stderr, "celix_err_tssKey is not initialized\n");
+        return NULL;
+    }
+
     celix_err_t* err = celix_tss_get(celix_err_tssKey);
     if (err) {
         return err;
@@ -52,9 +67,9 @@ static celix_err_t* celix_err_getTssErr() {
     err = malloc(sizeof(*err));
     if (err) {
         err->pos = 0; //no entry
-        int rc = celix_tss_set(celix_err_tssKey, err);
-        if (rc != 0) {
-            fprintf(stderr, "Failed to set thread specific storage for 
celix_err: %s\n", strerror(rc));
+        celix_status_t status = celix_tss_set(celix_err_tssKey, err);
+        if (status != CELIX_SUCCESS) {
+            fprintf(stderr, "Failed to set thread specific storage for 
celix_err\n");
             free(err);
             err = NULL;
         }
@@ -65,24 +80,24 @@ static celix_err_t* celix_err_getTssErr() {
 }
 
 __attribute__((constructor)) void celix_err_initThreadSpecificStorageKey() {
-    int rc = celix_tss_create(&celix_err_tssKey, celix_err_destroyTssErr);
-    if (rc != 0) {
+    celix_status_t status = celix_tss_create(&celix_err_tssKey, 
celix_err_destroyTssErr);
+    if (status == CELIX_SUCCESS) {
+        celix_err_tssKeyInitialized = true;
+    } else {
         fprintf(stderr,"Failed to create thread specific storage key for 
celix_err\n");
     }
 }
 
 __attribute__((destructor)) void celix_err_deinitThreadSpecificStorageKey() {
-    int rc = celix_tss_delete(celix_err_tssKey);
-    if (rc != 0) {
-        fprintf(stderr,"Failed to delete thread specific storage key for 
celix_err\n");
+    if (!celix_err_tssKeyInitialized) {
+        fprintf(stderr, "celix_err_tssKey is not initialized\n");
+        return;
     }
-}
-#else //Use __thread static variable instead of thread specific storage 
functions
-
-__thread celix_err_t celix_err_tssErr = { .buffer = {0}, .pos = 0 };
 
-static celix_err_t* celix_err_getTssErr() {
-    return &celix_err_tssErr;
+    celix_status_t status = celix_tss_delete(celix_err_tssKey);
+    if (status != CELIX_SUCCESS) {
+        fprintf(stderr,"Failed to delete thread specific storage key for 
celix_err\n");
+    }
 }
 
 #endif
@@ -145,7 +160,6 @@ void celix_err_pushf(const char* format, ...) {
             fprintf(stderr, "Failed to add error message '");
             vfprintf(stderr, format, args);
             fprintf(stderr, "' to celix_err\n");
-
         }
     }
     va_end(args);