Merge pull request #20751 from mckellyln/jemalloc_ldpreload

HPCC-35485 Add jemalloc allocator config option for LD_PRELOAD

Reviewed-by: Gavin Halliday <gavin.halliday@lexisnexisrisk.com>
Merged-by: Gavin Halliday <gavin.halliday@lexisnexisrisk.com>

Author: ghalliday

CMakeLists.txt

@@ -552,6 +552,14 @@ if(PLATFORM OR CLIENTTOOLS OR REMBED)
     install(FILES ${HPCC_SOURCE_DIR}/${LICENSE_FILE} DESTINATION "." COMPONENT Runtime)
 endif()
 
+# Install jemalloc library from vcpkg
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND PLATFORM)
+    file(GLOB JEMALLOC_LIBS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libjemalloc.so*")
+    if (JEMALLOC_LIBS)
+        install(FILES ${JEMALLOC_LIBS} DESTINATION "lib")
+    endif()
+endif()
+
 add_subdirectory(devel)
 
 #uninstall target

initfiles/etc/DIR_NAME/environment.conf.in

@@ -30,6 +30,11 @@ mpStart=7101
 mpEnd=7500
 mpSoMaxConn=128
 mpTraceLevel=0
+
+# enable jemalloc memory allocator in all HPCC components
+# which can help reduce process memory usage (and OOM kills) from system allocator fragmentation
+#useJemalloc=true
+
 # enable SSL for dafilesrv remote file access (SSLNone/false | SSLOnly/true | SSLFirst | UnsecureFirst | UnsecureAndSSL)
 # Enabling requires setting the HPCCPassPhrase, HPCCCertFile, and HPCCPrivateKeyFile values
 #dfsUseSSL=SSLNone

initfiles/sbin/hpcc_setenv.in

@@ -130,6 +130,36 @@ if [ -z "$MALLOC_ARENA_MAX" ]; then
     export MALLOC_ARENA_MAX=$num_arenas
 fi
 
+# search env or conf file for useJemalloc=true/false setting and if true, add libjemalloc to LD_PRELOAD
+HPCC_XMLFILE=${HPCC_XMLFILE:-${CONFIG_DIR}/${ENV_XML_FILE}}
+
+usejem=""
+jemline=$(sed -n '/\<envsettings/I,/\/envsettings/I{//!p;}' "${HPCC_XMLFILE}" 2>/dev/null | grep -i '<usejemalloc>')
+if [[ "$jemline" != "" ]] ; then
+    usejem=$(echo "$jemline" | awk -F '[<>]' 'tolower($0)~/usejemalloc/{print $3}' 2>/dev/null)
+fi
+if [[ "$usejem" == "" ]] ; then
+    jemline=$(grep -i usejemalloc "${HPCC_CONFIG}" 2>/dev/null)
+    if [[ "$jemline" != "" ]] ; then
+        item1=$(echo $jemline 2>/dev/null | awk '{print $1}' | cut -c 1)
+        if [[ "$item1" != '#' ]] ; then
+            usejem=$(echo $jemline 2>/dev/null | awk -F= '{print $2}' 2>/dev/null)
+        fi
+    fi
+fi
+
+if [[ "$usejem" != "" ]] ; then
+    usejem=$(echo "$usejem" | tr -d "[:blank:]" | tr "[:upper:]" "[:lower:]")
+fi
+
+if [[ "$usejem" == "true" ]] ; then
+    if [[ -s ${INSTALL_DIR}/lib/libjemalloc.so ]] ; then
+        if [[ ! "${LD_PRELOAD}" =~ .*libjemalloc.* ]] ; then
+            export LD_PRELOAD="${INSTALL_DIR}/lib/libjemalloc.so${LD_PRELOAD:+:${LD_PRELOAD}}"
+        fi
+    fi
+fi
+
 PATH_PREFIX=`cat ${HPCC_CONFIG} | sed -n "/\[${SECTION}\]/,/\[/p" | grep "^path *= *" | sed -e 's/^path *= *//'`
 
 export PID=`cat ${HPCC_CONFIG} | sed -n "/\[${SECTION}\]/,/\[/p" | grep "^pid *= *" | sed -e 's/^pid *= *//'`

rtl/eclrtl/rtlrecord.cpp

@@ -383,7 +383,12 @@ RtlRecord::~RtlRecord()
         {
             const RtlFieldInfo *thisField = *finger;
             if (thisField->flags & RFTMdynamic)
-                delete thisField;
+            {
+                if (thisField->flags & RFTMinifblock)
+                    delete (RtlCondFieldStrInfo *)thisField;
+                else
+                    delete thisField;
+            }
         }
         delete [] fields;
     }

vcpkg.json.in

@@ -104,6 +104,10 @@
             "name": "libiconv",
             "platform": "osx"
         },
+        {
+            "name": "jemalloc",
+            "platform": "linux"
+        },
         {
             "name": "libmemcached",
             "platform": "@VCPKG_MEMCACHED@ & !windows & !osx"