From ad7a59d7592493b568530f2cb77f107795a82ab8 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Tue, 6 Jul 2021 19:32:07 +0800
Subject: [PATCH] Hotfix/sangshuduo/td 3973 use jemalloc for master (#6768)

* [TD-3973]<feature>: add jemalloc as submodule.

* [TD-3973]<feature>: add jemalloc as submodule.

* [TD-3973]<feature>: use jemalloc.

build works as following instructions:

cmake .. -DJEMALLOC_ENABLED=true

make

* fix jemalloc at tag 5.2.1

* fix conflicts

* make install works.

* fix conflicts.

* release script works.

* fix typo

* [TD-3937]<feature>: support jemalloc

add install funtion to all scripts.

* adjust install_jemalloc() position for check compatibility.

* fix position bug.

* add ldconfig for jemalloc library cache refresh.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
---
 packaging/tools/install.sh              | 1 +
 packaging/tools/install_arbi.sh         | 1 +
 packaging/tools/install_arbi_power.sh   | 1 +
 packaging/tools/install_client.sh       | 1 +
 packaging/tools/install_client_power.sh | 1 +
 packaging/tools/install_power.sh        | 1 +
 packaging/tools/make_install.sh         | 1 +
 7 files changed, 7 insertions(+)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 226e09d846..16a99d7a0c 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -270,6 +270,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 
diff --git a/packaging/tools/install_arbi.sh b/packaging/tools/install_arbi.sh
index cdfeef0543..74a7d8cd3d 100755
--- a/packaging/tools/install_arbi.sh
+++ b/packaging/tools/install_arbi.sh
@@ -165,6 +165,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 
diff --git a/packaging/tools/install_arbi_power.sh b/packaging/tools/install_arbi_power.sh
index 161b916b4c..864fbb9844 100755
--- a/packaging/tools/install_arbi_power.sh
+++ b/packaging/tools/install_arbi_power.sh
@@ -158,6 +158,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index 2969a3cc98..9044f23672 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -182,6 +182,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 
diff --git a/packaging/tools/install_client_power.sh b/packaging/tools/install_client_power.sh
index d56527ecda..bb9be2493b 100755
--- a/packaging/tools/install_client_power.sh
+++ b/packaging/tools/install_client_power.sh
@@ -182,6 +182,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 
diff --git a/packaging/tools/install_power.sh b/packaging/tools/install_power.sh
index e6941301c1..bf4b1244ad 100755
--- a/packaging/tools/install_power.sh
+++ b/packaging/tools/install_power.sh
@@ -263,6 +263,7 @@ function install_jemalloc() {
             ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
             ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 0c755d9f72..6fb40a56c2 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -217,6 +217,7 @@ function install_jemalloc() {
             /usr/bin/install -c -d /usr/local/share/man/man3
             /usr/bin/install -c -m 644 ${binary_dir}/build/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
+        ${csudo} ldconfig
     fi
 }
 
-- 
GitLab