fix: fix memory leak in tls_transient_memory_t (#422)

apache · Mar 23, 2020 · 9b4cae8 · 9b4cae8
1 parent 67012ed
commit 9b4cae8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/dsn/utility/transient_memory.h b/include/dsn/utility/transient_memory.h
@@ -51,6 +51,13 @@ namespace dsn {
 
 typedef struct tls_transient_memory_t
 {
+    ~tls_transient_memory_t()
+    {
+        if (nullptr != block) {
+            *block = nullptr;
+        }
+    }
+
     unsigned int magic;
     size_t remain_bytes;
     char block_ptr_buffer[sizeof(std::shared_ptr<char>)];
@@ -59,7 +66,7 @@ typedef struct tls_transient_memory_t
     bool committed;
 } tls_transient_memory_t;
 
-extern __thread tls_transient_memory_t tls_trans_memory;
+extern thread_local tls_transient_memory_t tls_trans_memory;
 
 // initialize the default block size, should call this at the beginning of the process
 void tls_trans_mem_init(size_t default_per_block_bytes);

diff --git a/src/core/core/transient_memory.cpp b/src/core/core/transient_memory.cpp
@@ -40,7 +40,7 @@
 
 namespace dsn {
 
-__thread tls_transient_memory_t tls_trans_memory;
+thread_local tls_transient_memory_t tls_trans_memory;
 
 static size_t tls_trans_mem_default_block_bytes = 1024 * 1024; // 1 MB