8000 added documentation for jemalloc patch (#17951) · cloudhub-js/arangodb@5a54112 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5a54112

Browse files
authored
added documentation for jemalloc patch (arangodb#17951)
1 parent ee30284 commit 5a54112

File tree

1 file changed

+34
-0
lines changed

1 file changed

+34
-0
lines changed

3rdParty/README_maintainers.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,40 @@ Then copy `temp_modules.h` to `modules.h`, and fix the paths.
6666

6767
Only used on Linux/Mac, still uses autofoo.
6868

69+
The following change has been made to jemalloc compared to upstream commit
70+
54eaed1d8b56b1aa528be3bdd1877e59c56fa90c:
71+
72+
```diff
73+
diff --git a/3rdParty/jemalloc/CMakeLists.txt b/3rdParty/jemalloc/CMakeLists.txt
74+
index add5b967e2e..3ef8b0d6e39 100644
75+
--- a/3rdParty/jemalloc/CMakeLists.txt
76+
+++ b/3rdParty/jemalloc/CMakeLists.txt
77+
@@ -28,7 +28,7 @@ if (LINUX OR DARWIN)
78+
else ()
79+
set(JEMALLOC_CC_TMP "${CMAKE_C_COMPILER}")
80+
set(JEMALLOC_CXX_TMP "${CMAKE_CXX_COMPILER}")
81+
- set(JEMALLOC_CONFIG "background_thread:true")
82+
+ set(JEMALLOC_CONFIG "background_thread:true,cache_oblivious:false")
83+
endif ()
84+
85+
if (USE_JEMALLOC_PROF)
86+
diff --git a/3rdParty/jemalloc/v5.3.0/src/jemalloc.c b/3rdParty/jemalloc/v5.3.0/src/jemalloc.c
87+
index 7655de4e2f3..9e1c8a37627 100644
88+
--- a/3rdParty/jemalloc/v5.3.0/src/jemalloc.c
89+
+++ b/3rdParty/jemalloc/v5.3.0/src/jemalloc.c
90+
@@ -1220,6 +1220,7 @@ malloc_conf_init_helper(sc_data_t *sc_data, unsigned bin_shard_sizes[SC_NBINS],
91+
92+
CONF_HANDLE_BOOL(opt_abort, "abort")
93+
CONF_HANDLE_BOOL(opt_abort_conf, "abort_conf")
94+
+ CONF_HANDLE_BOOL(opt_cache_oblivious, "cache_oblivious")
95+
CONF_HANDLE_BOOL(opt_trust_madvise, "trust_madvise")
96+
if (strncmp("metadata_thp", k, klen) == 0) {
97+
int m;
98+
```
99+
This change will become irrelevant when upgrading to a newer version of
100+
jemalloc, because it is already contained in upstream jemalloc.
101+
102+
69103
## libunwind
70104

71105
Only used on Linux, still uses autofoo. The "aux" directory has been removed from the

0 commit comments

Comments
 (0)
0