Update Changelog.md

Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Version 2.6
+
+Use a more robust mutex (by using `std::recursive_mutex` instead of
+`pthread_mutex`).
+
+Minor refactorings.
+
 ## Version 2.5
 
 Added support for realloc().

src/another_memcheck.cc

@@ -3,6 +3,7 @@
 #include <iostream>
 #include <cstring>
 #include <cstdio>
+#include <mutex>
 
 // Local includes.
 #include "another_memcheck.h"
@@ -75,7 +76,7 @@ namespace SC_AM_Internal {
     return false;
   }
 
-  Stats::Stats() : malloced_list_head(nullptr), malloced_list_tail(nullptr), deferred_node(nullptr), pthread_mutex{.__align=0} {
+  Stats::Stats() : malloced_list_head(nullptr), malloced_list_tail(nullptr), deferred_node(nullptr), recursive_mutex(nullptr) {
   }
 
   void Stats::initialize() {
@@ -88,9 +89,9 @@ namespace SC_AM_Internal {
     malloced_list_head->data = nullptr;
     malloced_list_tail->data = nullptr;
 
-    deferred_node = nullptr;
-
-    pthread_mutex_init(&pthread_mutex, nullptr);
+    recursive_mutex = real_malloc(sizeof(std::recursive_mutex));
+    void *unused = new(recursive_mutex) std::recursive_mutex{};
+    (void)unused;
 
     on_exit([] ([[maybe_unused]] int status, void *ptr) {
       Stats *stats = reinterpret_cast<Stats*>(ptr);
@@ -100,15 +101,14 @@ namespace SC_AM_Internal {
   }
 
   void Stats::cleanup() {
-    pthread_mutex_destroy(&pthread_mutex);
+    using std_recursive_mutex = std::recursive_mutex;
+    ((std::recursive_mutex*)recursive_mutex)->~std_recursive_mutex();
+    real_free(recursive_mutex);
     // TODO maybe cleanup list, but it is the end of the program.
   }
 
   void *Stats::do_malloc(std::size_t size) {
-    if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) {
-      std::clog << "ERROR: pthread mutex not properly initialized!\n";
-      return nullptr;
-    }
+    ((std::recursive_mutex*)recursive_mutex)->lock();
 
     void *address = real_malloc(size);
     if (address != nullptr) {
@@ -122,15 +122,12 @@ namespace SC_AM_Internal {
       ListNode::add_to_list(malloced_list_tail, data);
     }
 
-    pthread_mutex_unlock(&pthread_mutex);
+    ((std::recursive_mutex*)recursive_mutex)->unlock();
     return address;
   }
 
   void *Stats::do_calloc(std::size_t n, std::size_t size) {
-    if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) {
-      std::clog << "ERROR: pthread mutex not properly initialized!\n";
-      return nullptr;
-    }
+    ((std::recursive_mutex*)recursive_mutex)->lock();
 
     void *address = real_calloc(n, size);
     if (address != nullptr) {
@@ -144,15 +141,12 @@ namespace SC_AM_Internal {
       ListNode::add_to_list(malloced_list_tail, data);
     }
 
-    pthread_mutex_unlock(&pthread_mutex);
+    ((std::recursive_mutex*)recursive_mutex)->unlock();
     return address;
   }
 
   void *Stats::do_realloc(void *ptr, std::size_t size) {
-    if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) {
-      std::clog << "ERROR: pthread mutex not properly initialized!\n";
-      return nullptr;
-    }
+    ((std::recursive_mutex*)recursive_mutex)->lock();
 
     if (ptr) {
       if (!ListNode::remove_from_list(malloced_list_head, ptr, this)) {
@@ -183,16 +177,13 @@ namespace SC_AM_Internal {
       }
     }
 
-    pthread_mutex_unlock(&pthread_mutex);
+    ((std::recursive_mutex*)recursive_mutex)->unlock();
     return address;
   }
 
   bool Stats::do_free(void *ptr) {
     bool result = false;
-    if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) {
-      std::clog << "ERROR: pthread mutex not properly initialized!\n";
-      return result;
-    }
+    ((std::recursive_mutex*)recursive_mutex)->lock();
 
     if (ptr) {
       if (!ListNode::remove_from_list(malloced_list_head, ptr)) {
@@ -203,7 +194,7 @@ namespace SC_AM_Internal {
       }
     }
 
-    pthread_mutex_unlock(&pthread_mutex);
+    ((std::recursive_mutex*)recursive_mutex)->unlock();
     return result;
   }
 

src/another_memcheck.h

@@ -1,10 +1,6 @@
 #ifndef SEODISPARATE_COM_ANOTHER_MEMCHECK_H
 #define SEODISPARATE_COM_ANOTHER_MEMCHECK_H
 
-extern "C" {
-#include <pthread.h>
-}
-
 namespace SC_AM_Internal {
   // Forward declaration.
   struct Stats;
@@ -56,7 +52,7 @@ namespace SC_AM_Internal {
     ListNode *malloced_list_head;
     ListNode *malloced_list_tail;
     ListNode *deferred_node;
-    pthread_mutex_t pthread_mutex;
+    void *recursive_mutex;
 
     void initialize();
     void cleanup();