tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add non working version of hooks alloc

Browse Source
This commit is contained in:
antoniofilipovic
2023-09-12 14:02:57 +02:00
parent 0f8ef3cdb2
commit 596760e655
3 changed files with 89 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/memgraph.cpp
View File

@@ -9,6 +9,7 @@
// by the Apache License, Version 2.0, included in the file
// licenses/APL.txt.
#include "memory/memory_control.hpp"
#ifndef MG_ENTERPRISE
#include "dbms/session_context_handler.hpp"
#endif
@@ -112,7 +113,7 @@ int main(int argc, char **argv) {
gflags::ShowUsageWithFlags(argv[0]);
exit(1);
}
// memgraph::memory::PrintStats();
memgraph::flags::InitializeLogger();
// Unhandled exception handler init.

160
src/memory/memory_control.cpp
View File

@@ -27,146 +27,133 @@ namespace memgraph::memory {
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define STRINGIFY(x) STRINGIFY_HELPER(x)
// static std::vector<extent_hooks_t*> original_hooks_vec;
static std::vector<extent_hooks_t *> original_hooks_vec;
extent_hooks_t *old_hooks;
extent_hooks_t *old_hooks = nullptr;
static void *my_alloc(extent_hooks_t *extent_hooks, void *new_addr, size_t size, size_t alignment, bool *zero,
bool *commit, unsigned arena_ind) {
// std::cout << fmt::format("In wrapper alloc_hook: new_addr: {}, size: {}, alignment: {}, arena_ind: {}", new_addr,
// size, alignment, arena_ind);
// printf("In wrapper alloc_hook: new_addr:%p "
// "size:%lu(%lu pages) alignment:%lu "
// "zero:%s commit:%s arena_ind:%u\n",
// new_addr, size, size / 4096, alignment,
// (*zero) ? "true" : "false",
// (*commit) ? "true" : "false",
// arena_ind);
// Default behavior using original hooks
MG_ASSERT(old_hooks && old_hooks->alloc);
return old_hooks->alloc(old_hooks, new_addr, size, alignment, zero, commit, arena_ind);
extent_alloc_t *old_alloc = nullptr;
void *my_alloc(extent_hooks_t *extent_hooks, void *new_addr, size_t size, size_t alignment, bool *zero, bool *commit,
unsigned arena_ind) {
MG_ASSERT(original_hooks_vec[arena_ind] && original_hooks_vec[arena_ind]->alloc);
return original_hooks_vec[arena_ind]->alloc(extent_hooks, new_addr, size, alignment, zero, commit, arena_ind);
}
static bool my_dalloc(extent_hooks_t *extent_hooks, void *addr, size_t size, bool committed, unsigned arena_ind) {
// std::cout << fmt::format("In wrapper my_dalloc: new_addr: {}, size: {}, arena_ind: {}", addr, size, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
return old_hooks->dalloc(extent_hooks, addr, size, committed, arena_ind);
}
static void my_destroy(extent_hooks_t *extent_hooks, void *addr, size_t size, bool committed, unsigned arena_ind) {
// std::cout << fmt::format("In wrapper my_destroy: new_addr: {}, size: {}, arena_ind: {}", addr, size, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
old_hooks->destroy(extent_hooks, addr, size, committed, arena_ind);
}
static bool my_commit(extent_hooks_t *extent_hooks, void *addr, size_t size, size_t offset, size_t length,
unsigned arena_ind) {
// std::cout << fmt::format("In wrapper my_commit: new_addr: {}, size: {}, arena_ind: {}", addr, size, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
return old_hooks->commit(extent_hooks, addr, size, offset, length, arena_ind);
}
static bool my_decommit(extent_hooks_t *extent_hooks, void *addr, size_t size, size_t offset, size_t length,
unsigned arena_ind) {
// std::cout << fmt::format("In wrapper my_decommit: new_addr: {}, size: {}, arena_ind: {}", addr, size, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
return old_hooks->decommit(extent_hooks, addr, size, offset, length, arena_ind);
}
static bool my_purge_forced(extent_hooks_t *extent_hooks, void *addr, size_t size, size_t offset, size_t length,
unsigned arena_ind) {
// std::cout << fmt::format("In wrapper purge_forced: new_addr: {}, size: {}, arena_ind: {}", addr, size, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
return old_hooks->purge_forced(extent_hooks, addr, size, offset, length, arena_ind);
}
static bool my_purge_lazy(extent_hooks_t *extent_hooks, void *addr, size_t size, size_t offset, size_t length,
unsigned arena_ind) {
// std::cout << fmt::format("In wrapper purge_lazy: new_addr: {}, size: {}, arena_ind: {}", addr, size, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
return old_hooks->purge_lazy(extent_hooks, addr, size, offset, length, arena_ind);
}
static bool my_split(extent_hooks_t *extent_hooks, void *addr, size_t size, size_t size_a, size_t size_b,
bool committed, unsigned arena_ind) {
// std::cout << fmt::format("In wrapper my_split: new_addr: {}, size: {}, arena_ind: {}", addr, size, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
MG_ASSERT(old_hooks && old_hooks->split);
return old_hooks->split(extent_hooks, addr, size, size_a, size_b, committed, arena_ind);
}
static bool my_merge(extent_hooks_t *extent_hooks, void *addr_a, size_t size_a, void *addr_b, size_t size_b,
bool committed, unsigned arena_ind) {
// std::cout << fmt::format("In wrapper my_merge: addr_a: {}, size_a: {}, arena_ind: {}", addr_a, size_a, arena_ind);
// extent_hooks_t *old_hooks = original_hooks_vec[arena_ind];
return old_hooks->merge(extent_hooks, addr_a, size_a, addr_b, size_b, committed, arena_ind);
}
static extent_hooks_t custom_hooks = {
.alloc = &my_alloc,
.dalloc = &my_dalloc,
.destroy = &my_destroy,
.commit = &my_commit,
.decommit = &my_decommit,
.purge_lazy = &my_purge_lazy,
.purge_forced = &my_purge_forced,
.split = &my_split,
.merge = &my_merge,
};
// static extent_hooks_t custom_hooks = {
// .alloc = &my_alloc,
// .dalloc = &my_dalloc,
// .destroy = &my_destroy,
// .commit = &my_commit,
// .decommit = &my_decommit,
// .purge_lazy = &my_purge_lazy,
// .purge_forced = &my_purge_forced,
// .split = &my_split,
// .merge = &my_merge,
// };
extent_hooks_t *new_hooks = &custom_hooks;
// static extent_hooks_t custom_hooks = {
// .alloc = nullptr,
// .dalloc = nullptr,
// .destroy = nullptr,
// .commit = nullptr,
// .decommit = nullptr,
// .purge_lazy =nullptr,
// .purge_forced = nullptr,
// .split = nullptr,
// .merge = nullptr
// };
static extent_hooks_t custom_hooks;
static extent_hooks_t *new_hooks = &custom_hooks;
void PrintStats() {
#if USE_JEMALLOC
uint64_t allocated{0};
uint64_t sz{sizeof(allocated)};
mallctl("stats.allocated", &allocated, &sz, nullptr, 0);
std::cout << "stats allocated:" << allocated << ", sz: " << std::endl;
// mallctl("stats.allocated", &allocated, &sz, nullptr, 0);
// std::cout << "stats allocated:" << allocated << ", sz: " << std::endl;
mallctl("stats.arenas." STRINGIFY(MALLCTL_ARENAS_ALL) ".pactive", &allocated, &sz, nullptr, 0);
std::cout << "stats allocated:" << allocated << ", sz: " << std::endl;
// mallctl("stats.arenas." STRINGIFY(MALLCTL_ARENAS_ALL) ".pactive", &allocated, &sz, nullptr, 0);
// std::cout << "stats allocated:" << allocated << ", sz: " << std::endl;
sz = sizeof(unsigned);
unsigned narenas{0};
int success = mallctl("opt.narenas", (void *)&narenas, &sz, nullptr, 0);
int err = mallctl("opt.narenas", (void *)&narenas, &sz, nullptr, 0);
if (err) {
return;
}
std::cout << narenas << " : n arenas" << std::endl;
if (nullptr != old_hooks) {
return;
}
// get original hooks
// original_hooks_vec.reserve(narenas);
// get original hooks and update alloc
original_hooks_vec.reserve(narenas);
for (int i = 0; i < narenas; i++) {
std::string func_name = "arena." + std::to_string(i) + ".extent_hooks";
size_t hooks_len = sizeof(old_hooks);
mallctlRead<extent_hooks_t *, true>(func_name.c_str(), &old_hooks);
int err = mallctl(func_name.c_str(), &old_hooks, &hooks_len, nullptr, 0);
custom_hooks = {.alloc = old_hooks->alloc,
.dalloc = old_hooks->dalloc,
.commit = old_hooks->commit,
.decommit = old_hooks->decommit,
.destroy = old_hooks->destroy,
.merge = old_hooks->merge,
.purge_forced = old_hooks->purge_forced,
.purge_lazy = old_hooks->purge_lazy,
.split = old_hooks->split};
if (mallctlWrite<extent_hooks_t *, true>(func_name.c_str(), &custom_hooks)) {
std::cout << "error writting hook" << std::endl;
if (err) {
std::cout << "error getting hooks for arena: " << i << std::endl;
continue;
}
original_hooks_vec.emplace_back(old_hooks);
custom_hooks = *old_hooks;
custom_hooks.alloc = &my_alloc;
err = mallctl(func_name.c_str(), nullptr, nullptr, &new_hooks, sizeof(new_hooks));
if (err) {
std::cout << "error writing new hooks" << std::endl;
}
}
// for(int i=0;i<narenas;i++){
// std::string arena_str = "arena."+std::to_string(i) + ".extent_hooks";
// extent_hooks_t *ptr = original_hooks_vec[i];
// size_t hooks_len = sizeof(ptr);
// if (mallctl(arena_str.c_str(), nullptr, nullptr, &new_hooks, hooks_len)) {
// std::cout<< "error setting new hook" << std::endl;
// }
// }
#endif
}
@@ -182,3 +169,30 @@ void PurgeUnusedMemory() {
#undef STRINGIFY_HELPER
} // namespace memgraph::memory
// int err = mallctlRead<extent_hooks_t *, true>(func_name.c_str(), &old_hooks);
// if (mallctlWrite<extent_hooks_t *, true>(func_name.c_str(), &custom_hooks)) {
// std::cout << "error writting hook" << std::endl;
// }
// for(int i=0;i<narenas;i++){
// std::string arena_str = "arena."+std::to_string(i) + ".extent_hooks";
// extent_hooks_t *ptr = original_hooks_vec[i];
// size_t hooks_len = sizeof(ptr);
// if (mallctl(arena_str.c_str(), nullptr, nullptr, &new_hooks, hooks_len)) {
// std::cout<< "error setting new hook" << std::endl;
// }
// }
// my alloc part
// std::cout << fmt::format("In wrapper alloc_hook: new_addr: {}, size: {}, alignment: {}, arena_ind: {}", new_addr,
// size, alignment, arena_ind);
// printf("In wrapper alloc_hook: new_addr:%p "
// "size:%lu(%lu pages) alignment:%lu "
// "zero:%s commit:%s arena_ind:%u\n",
// new_addr, size, size / 4096, alignment,
// (*zero) ? "true" : "false",
// (*commit) ? "true" : "false",
// arena_ind);
// Default behavior using original hooks

5
src/memory/memory_control.hpp
View File

@@ -24,11 +24,6 @@ int mallctlHelper(const char *cmd, T *out, T *in) {
return err;
}
template <typename T, bool ErrOK = false>
int mallctlReadWrite(const char *cmd, T *out, T in) {
return mallctlHelper<T, ErrOK>(cmd, out, &in);
}
template <typename T, bool ErrOK = false>
int mallctlRead(const char *cmd, T *out) {
return mallctlHelper<T, ErrOK>(cmd, out, static_cast<T *>(nullptr));