Merge pull request #10718 from kernelmethod/libtcmalloc_fixes
Small fixes to prepare_tcmalloc for Debian/Ubuntu compatibility
This commit is contained in:
commit
ba812b4495
2
webui.sh
2
webui.sh
@ -190,7 +190,7 @@ fi
|
|||||||
# Try using TCMalloc on Linux
|
# Try using TCMalloc on Linux
|
||||||
prepare_tcmalloc() {
|
prepare_tcmalloc() {
|
||||||
if [[ "${OSTYPE}" == "linux"* ]] && [[ -z "${NO_TCMALLOC}" ]] && [[ -z "${LD_PRELOAD}" ]]; then
|
if [[ "${OSTYPE}" == "linux"* ]] && [[ -z "${NO_TCMALLOC}" ]] && [[ -z "${LD_PRELOAD}" ]]; then
|
||||||
TCMALLOC="$(ldconfig -p | grep -Po "libtcmalloc.so.\d" | head -n 1)"
|
TCMALLOC="$(PATH=/usr/sbin:$PATH ldconfig -p | grep -Po "libtcmalloc(_minimal|)\.so\.\d" | head -n 1)"
|
||||||
if [[ ! -z "${TCMALLOC}" ]]; then
|
if [[ ! -z "${TCMALLOC}" ]]; then
|
||||||
echo "Using TCMalloc: ${TCMALLOC}"
|
echo "Using TCMalloc: ${TCMALLOC}"
|
||||||
export LD_PRELOAD="${TCMALLOC}"
|
export LD_PRELOAD="${TCMALLOC}"
|
||||||
|
Loading…
Reference in New Issue
Block a user