stephenseo/AnotherMemCheck
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use std::recursive_mutex instead of pthread_mutex

Browse source
This commit is contained in:
Stephen Seo 2024-11-12 14:38:25 +09:00
parent d4c47f871b
commit 394bfc8963
2 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/another_memcheck.cc
View file

@ -3,6 +3,7 @@
#include <iostream> #include <iostream>
#include <cstring> #include <cstring>
#include <cstdio> #include <cstdio>
#include <mutex>
// Local includes. // Local includes.
#include "another_memcheck.h" #include "another_memcheck.h"
@ -75,7 +76,7 @@ namespace SC_AM_Internal {
return false; 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), recursive_mutex(nullptr) {
} }
void Stats::initialize() { void Stats::initialize() {
@ -90,7 +91,9 @@ namespace SC_AM_Internal {
deferred_node = 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) { on_exit([] ([[maybe_unused]] int status, void *ptr) {
Stats *stats = reinterpret_cast<Stats*>(ptr); Stats *stats = reinterpret_cast<Stats*>(ptr);
@ -100,15 +103,14 @@ namespace SC_AM_Internal {
} }
void Stats::cleanup() { 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. // TODO maybe cleanup list, but it is the end of the program.
} }
void *Stats::do_malloc(std::size_t size) { void *Stats::do_malloc(std::size_t size) {
if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) { ((std::recursive_mutex*)recursive_mutex)->lock();
std::clog << "ERROR: pthread mutex not properly initialized!\n";
return nullptr;
}
void *address = real_malloc(size); void *address = real_malloc(size);
if (address != nullptr) { if (address != nullptr) {
@ -122,15 +124,12 @@ namespace SC_AM_Internal {
ListNode::add_to_list(malloced_list_tail, data); ListNode::add_to_list(malloced_list_tail, data);
} }
pthread_mutex_unlock(&pthread_mutex); ((std::recursive_mutex*)recursive_mutex)->unlock();
return address; return address;
} }
void *Stats::do_calloc(std::size_t n, std::size_t size) { void *Stats::do_calloc(std::size_t n, std::size_t size) {
if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) { ((std::recursive_mutex*)recursive_mutex)->lock();
std::clog << "ERROR: pthread mutex not properly initialized!\n";
return nullptr;
}
void *address = real_calloc(n, size); void *address = real_calloc(n, size);
if (address != nullptr) { if (address != nullptr) {
@ -144,15 +143,12 @@ namespace SC_AM_Internal {
ListNode::add_to_list(malloced_list_tail, data); ListNode::add_to_list(malloced_list_tail, data);
} }
pthread_mutex_unlock(&pthread_mutex); ((std::recursive_mutex*)recursive_mutex)->unlock();
return address; return address;
} }
void *Stats::do_realloc(void *ptr, std::size_t size) { void *Stats::do_realloc(void *ptr, std::size_t size) {
if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) { ((std::recursive_mutex*)recursive_mutex)->lock();
std::clog << "ERROR: pthread mutex not properly initialized!\n";
return nullptr;
}
if (ptr) { if (ptr) {
if (!ListNode::remove_from_list(malloced_list_head, ptr, this)) { if (!ListNode::remove_from_list(malloced_list_head, ptr, this)) {
@ -183,16 +179,13 @@ namespace SC_AM_Internal {
} }
} }
pthread_mutex_unlock(&pthread_mutex); ((std::recursive_mutex*)recursive_mutex)->unlock();
return address; return address;
} }
bool Stats::do_free(void *ptr) { bool Stats::do_free(void *ptr) {
bool result = false; bool result = false;
if(int ret = pthread_mutex_lock(&pthread_mutex); ret == EINVAL) { ((std::recursive_mutex*)recursive_mutex)->lock();
std::clog << "ERROR: pthread mutex not properly initialized!\n";
return result;
}
if (ptr) { if (ptr) {
if (!ListNode::remove_from_list(malloced_list_head, ptr)) { if (!ListNode::remove_from_list(malloced_list_head, ptr)) {
@ -203,7 +196,7 @@ namespace SC_AM_Internal {
} }
} }
pthread_mutex_unlock(&pthread_mutex); ((std::recursive_mutex*)recursive_mutex)->unlock();
return result; return result;
} }

6
src/another_memcheck.h
View file

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