error handling

Author: bratpiorka

src/pool/pool_disjoint.c

@@ -27,10 +27,14 @@
 
 #include "pool_disjoint_temp.h"
 
+// TODO remove
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+//static <- make static rename to TLS_last_allocation_error
+__TLS umf_result_t TLS_last_allocation_error_dp;
+
 static size_t CutOff = (size_t)1 << 31; // 2GB
 
 // Temporary solution for disabling memory poisoning. This is needed because
@@ -768,6 +772,7 @@ void AllocImpl_printStats(AllocImpl *ai, bool *TitlePrinted,
     }
 }
 
+// TODO remove
 #ifdef __cplusplus
 }
 #endif

src/pool/pool_disjoint.cpp

@@ -46,6 +46,8 @@ extern "C" {
 
 #include "pool_disjoint_temp.h"
 
+extern __TLS umf_result_t TLS_last_allocation_error_dp;
+
 #ifdef __cplusplus
 }
 #endif
@@ -221,7 +223,7 @@ static void *memoryProviderAlloc(umf_memory_provider_handle_t hProvider,
     void *ptr;
     auto ret = umfMemoryProviderAlloc(hProvider, size, alignment, &ptr);
     if (ret != UMF_RESULT_SUCCESS) {
-        umf::getPoolLastStatusRef<DisjointPool>() = ret;
+        TLS_last_allocation_error_dp = ret;
         return NULL;
     }
     annotate_memory_inaccessible(ptr, size);
@@ -243,7 +245,7 @@ static umf_result_t memoryProviderFree(umf_memory_provider_handle_t hProvider,
     auto ret = umfMemoryProviderFree(hProvider, ptr, size);
     if (ret != UMF_RESULT_SUCCESS) {
 
-        umf::getPoolLastStatusRef<DisjointPool>() = ret;
+        TLS_last_allocation_error_dp = ret;
         // throw MemoryProviderError{ret};
         return ret;
     }
@@ -295,8 +297,7 @@ void *AllocImpl_allocate(AllocImpl *ai, size_t Size, bool *FromPool) {
 
         if (Ptr == NULL) {
             // TODO get code from func
-            umf::getPoolLastStatusRef<DisjointPool>() =
-                UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
+            TLS_last_allocation_error_dp = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
             return nullptr;
         }
 
@@ -314,8 +315,7 @@ void *AllocImpl_allocate(AllocImpl *ai, size_t Size, bool *FromPool) {
 
     if (Ptr == NULL) {
         // TODO get code from func
-        umf::getPoolLastStatusRef<DisjointPool>() =
-            UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
+        TLS_last_allocation_error_dp = UMF_RESULT_ERROR_OUT_OF_HOST_MEMORY;
         return nullptr;
     }
 
@@ -493,13 +493,13 @@ void *DisjointPool::malloc(size_t size) { // For full-slab allocations indicates
 
 void *DisjointPool::calloc(size_t, size_t) {
     // Not supported
-    umf::getPoolLastStatusRef<DisjointPool>() = UMF_RESULT_ERROR_NOT_SUPPORTED;
+    TLS_last_allocation_error_dp = UMF_RESULT_ERROR_NOT_SUPPORTED;
     return NULL;
 }
 
 void *DisjointPool::realloc(void *, size_t) {
     // Not supported
-    umf::getPoolLastStatusRef<DisjointPool>() = UMF_RESULT_ERROR_NOT_SUPPORTED;
+    TLS_last_allocation_error_dp = UMF_RESULT_ERROR_NOT_SUPPORTED;
     return NULL;
 }
 
@@ -542,7 +542,7 @@ umf_result_t DisjointPool::free(void *ptr) {
 }
 
 umf_result_t DisjointPool::get_last_allocation_error() {
-    return umf::getPoolLastStatusRef<DisjointPool>();
+    return TLS_last_allocation_error_dp;
 }
 
 DisjointPool::DisjointPool() {}