CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7)
 project(AnotherMemCheck)
 
-set(AnotherMemCheck_VERSION 2.8)
+set(AnotherMemCheck_VERSION 2.7)
 set(AnotherMemCheck_SOVERSION 2)
 
 set(AnotherMemCheck_SOURCES

Changelog.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## Version 2.8
-
-Internal refactorings.
-
-Minor change to avoid segfault when program exits with `exit(...)` function.
-
 ## Version 2.7
 
 Fix incorrect initialization.

src/another_memcheck.cc

@@ -8,9 +8,6 @@
 // Local includes.
 #include "another_memcheck.h"
 
-// Function declaration.
-void exit_handler_stats();
-
 namespace SC_AM_Internal {
   Stats *stats = nullptr;
   int is_env_status = 0;
@@ -19,7 +16,7 @@ namespace SC_AM_Internal {
   Stats *get_init_stats() {
     Stats *stats = reinterpret_cast<SC_AM_Internal::Stats*>(
         real_malloc(sizeof(Stats)));
-    [[maybe_unused]] void *unused = new(stats) Stats{};
+    stats->initialize();
     is_env_status = getenv("ANOTHER_MEMCHECK_QUIET") != nullptr
       ? ANOTHER_MEMCHECK_QUIET_EXISTS
       : ANOTHER_MEMCHECK_QUIET_NOT_EXISTS;
@@ -80,6 +77,9 @@ namespace SC_AM_Internal {
   }
 
   Stats::Stats() : malloced_list_head(nullptr), malloced_list_tail(nullptr), deferred_node(nullptr), recursive_mutex(nullptr) {
+  }
+
+  void Stats::initialize() {
     malloced_list_head = reinterpret_cast<ListNode*>(real_malloc(sizeof(ListNode)));
     malloced_list_tail = reinterpret_cast<ListNode*>(real_malloc(sizeof(ListNode)));
     malloced_list_head->next = malloced_list_tail;
@@ -92,12 +92,17 @@ namespace SC_AM_Internal {
     deferred_node = nullptr;
 
     recursive_mutex = real_malloc(sizeof(std::recursive_mutex));
-    [[maybe_unused]] void *unused = new(recursive_mutex) std::recursive_mutex{};
+    void *unused = new(recursive_mutex) std::recursive_mutex{};
+    (void)unused;
 
-    std::atexit(exit_handler_stats);
+    on_exit([] ([[maybe_unused]] int status, void *ptr) {
+      Stats *stats = reinterpret_cast<Stats*>(ptr);
+      stats->print_status();
+      stats->cleanup();
+    }, this);
   }
 
-  Stats::~Stats() {
+  void Stats::cleanup() {
     using std_recursive_mutex = std::recursive_mutex;
     ((std::recursive_mutex*)recursive_mutex)->~std_recursive_mutex();
     real_free(recursive_mutex);
@@ -213,17 +218,4 @@ namespace SC_AM_Internal {
   }
 }
 
-// Function definition.
-void exit_handler_stats() {
-  if (SC_AM_Internal::stats != nullptr) {
-    SC_AM_Internal::stats->print_status();
-
-    // Avoids segfault when program calls `exit(...)`. OS should reclaim memory
-    // when the process ends even if it isn't free'd here.
-    //using SCS_AM_INTERNAL_Stats = SC_AM_Internal::Stats;
-    //SC_AM_Internal::stats->~SCS_AM_INTERNAL_Stats();
-    //SC_AM_Internal::stats = nullptr;
-  }
-}
-
 // vim: et sw=2 ts=2 sts=2

src/another_memcheck.h

@@ -1,8 +1,6 @@
 #ifndef SEODISPARATE_COM_ANOTHER_MEMCHECK_H
 #define SEODISPARATE_COM_ANOTHER_MEMCHECK_H
 
-#include <cstdint>
-
 namespace SC_AM_Internal {
   // Forward declaration.
   struct Stats;
@@ -50,21 +48,15 @@ namespace SC_AM_Internal {
 
   struct Stats {
     Stats();
-    ~Stats();
-
-    // Disable copy.
-    Stats(Stats &other) = delete;
-    Stats& operator=(Stats &other) = delete;
-
-    // Disable move.
-    Stats(Stats &&other) = delete;
-    Stats& operator=(Stats &&other) = delete;
 
     ListNode *malloced_list_head;
     ListNode *malloced_list_tail;
     ListNode *deferred_node;
     void *recursive_mutex;
 
+    void initialize();
+    void cleanup();
+
     void *do_malloc(std::size_t size);
     void *do_calloc(std::size_t n, std::size_t size);
     void *do_realloc(void*, std::size_t size);