Skip to content

Commit

Permalink
Revert "[fix](memory) Disable Jemalloc Hook and loading libjvm at run…
Browse files Browse the repository at this point in the history
…time (#45210)"

This reverts commit 8218bfd.
  • Loading branch information
BiteTheDDDDt committed Dec 13, 2024
1 parent 4131d3c commit 318087e
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion be/src/http/default_path_handlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void mem_usage_handler(const WebPageHandler::ArgumentMap& args, std::stringstrea
auto* _opaque = static_cast<std::string*>(opaque);
_opaque->append(buf);
};
malloc_stats_print(write_cb, &tmp, "a");
jemalloc_stats_print(write_cb, &tmp, "a");
boost::replace_all(tmp, "\n", "<br>");
(*output) << tmp << "</pre>";
#else
Expand Down
4 changes: 3 additions & 1 deletion be/src/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/src/runtime")

file(GLOB_RECURSE RUNTIME_FILES CONFIGURE_DEPENDS *.cpp *.cc)

list(REMOVE_ITEM RUNTIME_FILES ${CMAKE_CURRENT_SOURCE_DIR}/memory/jemalloc_hook.cpp)
if (NOT USE_JEMALLOC OR NOT USE_MEM_TRACKER)
list(REMOVE_ITEM RUNTIME_FILES ${CMAKE_CURRENT_SOURCE_DIR}/memory/jemalloc_hook.cpp)
endif()

add_library(Runtime STATIC
${RUNTIME_FILES}
Expand Down
8 changes: 4 additions & 4 deletions be/src/runtime/memory/heap_profiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ void HeapProfiler::set_prof_active(bool prof) {
#ifdef USE_JEMALLOC
std::lock_guard guard(_mutex);
try {
int err = mallctl("prof.active", nullptr, nullptr, &prof, 1);
err |= mallctl("prof.thread_active_init", nullptr, nullptr, &prof, 1);
int err = jemallctl("prof.active", nullptr, nullptr, &prof, 1);
err |= jemallctl("prof.thread_active_init", nullptr, nullptr, &prof, 1);
if (err) {
LOG(WARNING) << "jemalloc heap profiling start failed, " << err;
} else {
Expand All @@ -48,7 +48,7 @@ bool HeapProfiler::get_prof_dump(const std::string& profile_file_name) {
std::lock_guard guard(_mutex);
const char* file_name_ptr = profile_file_name.c_str();
try {
int err = mallctl("prof.dump", nullptr, nullptr, &file_name_ptr, sizeof(const char*));
int err = jemallctl("prof.dump", nullptr, nullptr, &file_name_ptr, sizeof(const char*));
if (err) {
LOG(WARNING) << "dump heap profile failed, " << err;
return false;
Expand Down Expand Up @@ -93,7 +93,7 @@ bool HeapProfiler::check_heap_profiler() {
#ifdef USE_JEMALLOC
size_t value = 0;
size_t sz = sizeof(value);
mallctl("prof.active", &value, &sz, nullptr, 0);
jemallctl("prof.active", &value, &sz, nullptr, 0);
return value;
#else
return false;
Expand Down
2 changes: 1 addition & 1 deletion be/src/util/mem_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void MemInfo::refresh_allocator_mem() {
// the current epoch number, which might be useful to log as a sanity check.
uint64_t epoch = 0;
size_t sz = sizeof(epoch);
mallctl("epoch", &epoch, &sz, &epoch, sz);
jemallctl("epoch", &epoch, &sz, &epoch, sz);

// Number of extents of the given type in this arena in the bucket corresponding to page size index.
// Large size class starts at 16384, the extents have three sizes before 16384: 4096, 8192, and 12288, so + 3
Expand Down
10 changes: 5 additions & 5 deletions be/src/util/mem_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class MemInfo {
#ifdef USE_JEMALLOC
size_t value = 0;
size_t sz = sizeof(value);
if (mallctl(name.c_str(), &value, &sz, nullptr, 0) == 0) {
if (jemallctl(name.c_str(), &value, &sz, nullptr, 0) == 0) {
return value;
}
#endif
Expand All @@ -111,7 +111,7 @@ class MemInfo {
#ifdef USE_JEMALLOC
unsigned value = 0;
size_t sz = sizeof(value);
if (mallctl(name.c_str(), &value, &sz, nullptr, 0) == 0) {
if (jemallctl(name.c_str(), &value, &sz, nullptr, 0) == 0) {
return value;
}
#endif
Expand Down Expand Up @@ -143,8 +143,8 @@ class MemInfo {
if (config::enable_je_purge_dirty_pages) {
try {
// Purge all unused dirty pages for arena <i>, or for all arenas if <i> equals MALLCTL_ARENAS_ALL.
int err = mallctl(fmt::format("arena.{}.purge", MALLCTL_ARENAS_ALL).c_str(),
nullptr, nullptr, nullptr, 0);
int err = jemallctl(fmt::format("arena.{}.purge", MALLCTL_ARENAS_ALL).c_str(),
nullptr, nullptr, nullptr, 0);
if (err) {
LOG(WARNING) << "Jemalloc purge all unused dirty pages failed";
}
Expand All @@ -163,7 +163,7 @@ class MemInfo {
#ifdef USE_JEMALLOC
constexpr size_t TCACHE_LIMIT = (1ULL << 30); // 1G
if (allocator_cache_mem() - je_dirty_pages_mem() > TCACHE_LIMIT) {
int err = mallctl("thread.tcache.flush", nullptr, nullptr, nullptr, 0);
int err = jemallctl("thread.tcache.flush", nullptr, nullptr, nullptr, 0);
if (err) {
LOG(WARNING) << "Jemalloc thread.tcache.flush failed";
}
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/common/allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class DefaultMemoryAllocator {

static void release_unused() {
#if defined(USE_JEMALLOC)
mallctl(fmt::format("arena.{}.purge", MALLCTL_ARENAS_ALL).c_str(), NULL, NULL, NULL, 0);
jemallctl(fmt::format("arena.{}.purge", MALLCTL_ARENAS_ALL).c_str(), NULL, NULL, NULL, 0);
#endif // defined(USE_JEMALLOC)
}
};
Expand Down
4 changes: 1 addition & 3 deletions thirdparty/build-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1523,10 +1523,8 @@ build_jemalloc() {
WITH_LG_PAGE=''
fi

# CFLAGS="${cflags}" ../configure --prefix="${TP_INSTALL_DIR}" --with-install-suffix="_doris" "${WITH_LG_PAGE}" \
# --with-jemalloc-prefix=je --enable-prof --disable-cxx --disable-libdl --disable-shared
CFLAGS="${cflags}" ../configure --prefix="${TP_INSTALL_DIR}" --with-install-suffix="_doris" "${WITH_LG_PAGE}" \
--enable-prof --disable-libdl --disable-shared
--with-jemalloc-prefix=je --enable-prof --disable-cxx --disable-libdl --disable-shared

make -j "${PARALLEL}"
make install
Expand Down

0 comments on commit 318087e

Please sign in to comment.