tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve MEMPROF size tracking.

Browse Source 
GitOrigin-RevId: 3f7a82afbc464edb0dc3ad7b27bdd7e4e1de25cc
This commit is contained in:
levlam 2020-08-11 07:54:39 +03:00
parent b6c915c2f8
commit c780fc2812
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
memprof/memprof.cpp
View File

@ -11,7 +11,6 @@
#if (TD_DARWIN || TD_LINUX) && defined(USE_MEMPROF) #if (TD_DARWIN || TD_LINUX) && defined(USE_MEMPROF)
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <cassert>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
#include <cstdlib> #include <cstdlib>
@ -34,6 +33,11 @@ double get_fast_backtrace_success_rate() {
} }
#else #else
#define my_assert(f) \
if (!(f)) { \
std::abort(); \
}
#if TD_LINUX #if TD_LINUX
extern void *__libc_stack_end; extern void *__libc_stack_end;
#endif #endif
@ -156,7 +160,7 @@ std::int32_t get_ht_pos(const Backtrace &bt, bool force = false) {
if (pos_hash == 0) { if (pos_hash == 0) {
if (ht_size > HT_MAX_SIZE / 2) { if (ht_size > HT_MAX_SIZE / 2) {
if (force) { if (force) {
assert(ht_size * 10 < HT_MAX_SIZE * 7); my_assert(ht_size * 10 < HT_MAX_SIZE * 7);
} else { } else {
Backtrace unknown_bt{{nullptr}}; Backtrace unknown_bt{{nullptr}};
unknown_bt[0] = reinterpret_cast<void *>(1); unknown_bt[0] = reinterpret_cast<void *>(1);
@ -188,18 +192,21 @@ std::int32_t get_ht_pos(const Backtrace &bt, bool force = false) {
void dump_alloc(const std::function<void(const AllocInfo &)> &func) { void dump_alloc(const std::function<void(const AllocInfo &)> &func) {
for (auto &node : ht) { for (auto &node : ht) {
if (node.size == 0) { auto size = node.size.load(std::memory_order_relaxed);
if (size == 0) {
continue; continue;
} }
func(AllocInfo{node.backtrace, node.size.load()}); func(AllocInfo{node.backtrace, size});
} }
} }
void register_xalloc(malloc_info *info, std::int32_t diff) { void register_xalloc(malloc_info *info, std::int32_t diff) {
my_assert(info->size >= 0);
if (diff > 0) { if (diff > 0) {
ht[info->ht_pos].size += info->size; ht[info->ht_pos].size.fetch_add(info->size, std::memory_order_relaxed);
} else { } else {
ht[info->ht_pos].size -= info->size; auto old_value = ht[info->ht_pos].size.fetch_sub(info->size, std::memory_order_relaxed);
my_assert(old_value >= static_cast<std::size_t>(info->size));
} }
} }
@ -234,7 +241,7 @@ static malloc_info *get_info(void *data_void) {
auto *buf = data - RESERVED_SIZE; auto *buf = data - RESERVED_SIZE;
auto *info = reinterpret_cast<malloc_info *>(buf); auto *info = reinterpret_cast<malloc_info *>(buf);
assert(info->magic == MALLOC_INFO_MAGIC); my_assert(info->magic == MALLOC_INFO_MAGIC);
return info; return info;
} }
@ -276,7 +283,7 @@ void *realloc(void *ptr, std::size_t size) {
return new_ptr; return new_ptr;
} }
void *memalign(std::size_t aligment, std::size_t size) { void *memalign(std::size_t aligment, std::size_t size) {
assert(false && "Memalign is unsupported"); my_assert(false && "Memalign is unsupported");
return nullptr; return nullptr;
} }
} }