aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2024-02-11 08:28:42 +0300
committerGitHub <noreply@github.com>2024-02-11 08:28:42 +0300
commit4d46f8c25c5665df7a7655b2486056cb1b37c7b0 (patch)
treed149b71e3f007b899b9846f7b489904d8fbe2a17
parent5ddd5d29e5c36d7f87436bdef23f72b585f51c52 (diff)
parent2ba0277b52d352966046cb7b0c5c047cd8a7cdd4 (diff)
Merge pull request #14883 from analysisjp/dev_fix_memleak_new
fix prepare_tcmalloc (fix: #14227)(Fixed memory leak issue in Ubuntu 22.04 or modern linux environment)
-rwxr-xr-xwebui.sh54
1 files changed, 36 insertions, 18 deletions
diff --git a/webui.sh b/webui.sh
index 25b94906..794cfb8a 100755
--- a/webui.sh
+++ b/webui.sh
@@ -226,30 +226,48 @@ fi
# Try using TCMalloc on Linux
prepare_tcmalloc() {
if [[ "${OSTYPE}" == "linux"* ]] && [[ -z "${NO_TCMALLOC}" ]] && [[ -z "${LD_PRELOAD}" ]]; then
+ # check glibc version
+ LIBC_LIB="$(PATH=/usr/sbin:$PATH ldconfig -p | grep -P "libc.so.6" | head -n 1)"
+ LIBC_INFO=$(echo ${LIBC_LIB} | awk '{print $NF}')
+ LIBC_VER=$(echo $(${LIBC_INFO} | awk 'NR==1 {print $NF}') | grep -oP '\d+\.\d+')
+ echo "glibc version is $LIBC_VER"
+ libc_vernum=$(expr $LIBC_VER)
+ # Since 2.34 libpthread is integrated into libc.so
+ libc_v234=2.34
# Define Tcmalloc Libs arrays
TCMALLOC_LIBS=("libtcmalloc(_minimal|)\.so\.\d" "libtcmalloc\.so\.\d")
-
# Traversal array
for lib in "${TCMALLOC_LIBS[@]}"
do
- #Determine which type of tcmalloc library the library supports
- TCMALLOC="$(PATH=/usr/sbin:$PATH ldconfig -p | grep -P $lib | head -n 1)"
- TC_INFO=(${TCMALLOC//=>/})
- if [[ ! -z "${TC_INFO}" ]]; then
- echo "Using TCMalloc: ${TC_INFO}"
- #Determine if the library is linked to libptthread and resolve undefined symbol: ptthread_Key_Create
- if ldd ${TC_INFO[2]} | grep -q 'libpthread'; then
- echo "$TC_INFO is linked with libpthread,execute LD_PRELOAD=${TC_INFO}"
- export LD_PRELOAD="${TC_INFO}"
- break
- else
- echo "$TC_INFO is not linked with libpthreadand will trigger undefined symbol: ptthread_Key_Create error"
- fi
- else
- printf "\e[1m\e[31mCannot locate TCMalloc (improves CPU memory usage)\e[0m\n"
- fi
+ # Determine which type of tcmalloc library the library supports
+ TCMALLOC="$(PATH=/usr/sbin:$PATH ldconfig -p | grep -P $lib | head -n 1)"
+ TC_INFO=(${TCMALLOC//=>/})
+ if [[ ! -z "${TC_INFO}" ]]; then
+ echo "Check TCMalloc: ${TC_INFO}"
+ # Determine if the library is linked to libptthread and resolve undefined symbol: ptthread_key_create
+ if [ $(echo "$libc_vernum < $libc_v234" | bc) -eq 1 ]; then
+ # glibc < 2.33 pthread_key_create into libpthead.so. check linking libpthread.so...
+ if ldd ${TC_INFO[2]} | grep -q 'libpthread'; then
+ echo "$TC_INFO is linked with libpthread,execute LD_PRELOAD=${TC_INFO[2]}"
+ # set fullpath LD_PRELOAD (To be on the safe side)
+ export LD_PRELOAD="${TC_INFO[2]}"
+ break
+ else
+ echo "$TC_INFO is not linked with libpthread will trigger undefined symbol: pthread_Key_create error"
+ fi
+ else
+ # Version 2.34 of libc.so (glibc) includes the pthead library IN GLIBC. (USE ubuntu 22.04 and modern linux system and WSL)
+ # libc.so(glibc) is linked with a library that works in ALMOST ALL Linux userlands. SO NO CHECK!
+ echo "$TC_INFO is linked with libc.so,execute LD_PRELOAD=${TC_INFO[2]}"
+ # set fullpath LD_PRELOAD (To be on the safe side)
+ export LD_PRELOAD="${TC_INFO[2]}"
+ break
+ fi
+ fi
done
-
+ if [[ -z "${LD_PRELOAD}" ]]; then
+ printf "\e[1m\e[31mCannot locate TCMalloc. Do you have tcmalloc or gperftools installed on your system? (improves CPU memory usage)\e[0m\n"
+ fi
fi
}