diff options
author | fanquake <fanquake@gmail.com> | 2023-05-18 11:33:23 +0100 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2023-05-18 11:33:35 +0100 |
commit | 8146f2a035f4d4c22513ff82db307326fb93638c (patch) | |
tree | 8aa78aac8efef10840f5eab6d8d17cf9132b4552 | |
parent | 4bca26e744e560dedeb8f49dc9661006e38e676d (diff) | |
parent | 7014e080154f9c82e4fbe043af292a1e761cdb55 (diff) | |
download | bitcoin-8146f2a035f4d4c22513ff82db307326fb93638c.tar.xz |
Merge bitcoin/bitcoin#27689: doc: remove mention of glibc 2.10+
7014e080154f9c82e4fbe043af292a1e761cdb55 doc: remove mention of glibc 2.10+ (fanquake)
Pull request description:
We already require glibc 2.27+, so mentioning a much older version here is redundant.
ACKs for top commit:
TheCharlatan:
ACK 7014e080154f9c82e4fbe043af292a1e761cdb55
Tree-SHA512: 883a566a80cabe34bfb5d902990f3eca08d0e11438e6c128d311e558f373ec232b0934deb85d12d796baacfeae590af8c73aa1b2faef07f27ffa9011270ffd96
-rw-r--r-- | doc/reduce-memory.md | 2 | ||||
-rw-r--r-- | src/rpc/node.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/reduce-memory.md b/doc/reduce-memory.md index 25205258b8..dbe88d45f3 100644 --- a/doc/reduce-memory.md +++ b/doc/reduce-memory.md @@ -43,7 +43,7 @@ threads take up 8MiB for the thread stack on a 64-bit system, and 4MiB in a ## Linux specific -By default, since glibc `2.10`, the C library will create up to two heap arenas per core. This is known to cause excessive memory usage in some scenarios. To avoid this make a script that sets `MALLOC_ARENA_MAX` before starting bitcoind: +By default, glibc will create up to two heap arenas per core. This is known to cause excessive memory usage in some scenarios. To avoid this make a script that sets `MALLOC_ARENA_MAX` before starting bitcoind: ```bash #!/usr/bin/env bash diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp index 5918bc6e38..ca8db0f82a 100644 --- a/src/rpc/node.cpp +++ b/src/rpc/node.cpp @@ -163,7 +163,7 @@ static RPCHelpMan getmemoryinfo() { {"mode", RPCArg::Type::STR, RPCArg::Default{"stats"}, "determines what kind of information is returned.\n" " - \"stats\" returns general statistics about memory usage in the daemon.\n" - " - \"mallocinfo\" returns an XML string describing low-level heap state (only available if compiled with glibc 2.10+)."}, + " - \"mallocinfo\" returns an XML string describing low-level heap state (only available if compiled with glibc)."}, }, { RPCResult{"mode \"stats\"", |