Merge branch 'master' into 'master' (merge request !278)

support jemalloc profile
support jemalloc profile

CMakeLists.txt

@@ -76,7 +76,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
 		option(WITH_JEMALLOC "enable jemalloc of rocksdb" ON)
 
 		add_custom_command(OUTPUT "${JEMALLOC_ROOT_DIR}/include/jemalloc/jemalloc.h"
-				COMMAND ./autogen.sh
+                # NOTE(takenliu) support jemalloc profile, before start tendisplus need export as below:
+                #     export MALLOC_CONF="prof:true,prof_prefix:jeprof.out"
+				COMMAND ./autogen.sh --enable-prof
 				WORKING_DIRECTORY ${JEMALLOC_ROOT_DIR})
 		add_custom_command(OUTPUT "${JEMALLOC_ROOT_DIR}/lib/libjemalloc.a"
                 "${JEMALLOC_ROOT_DIR}/lib/libjemalloc.so"

mkreleasehdr.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
 GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
 BUILD_ID=`uname -n`"-"`date +%s`
@@ -36,3 +37,4 @@ echo "#endif  // SRC_TENDISPLUS_COMMANDS_RELEASE_H_" >> ${h_file}
 
 
 touch ${c_file} # Force recompile of release.c
+

src/tendisplus/commands/debug.cpp

@@ -22,6 +22,7 @@
 #include <thread>  // NOLINT
 #include <chrono>  // NOLINT
 #include "glog/logging.h"
+#include "jemalloc/jemalloc.h"
 #include "rapidjson/document.h"
 #include "rapidjson/prettywriter.h"
 #include "rapidjson/stringbuffer.h"
@@ -4380,4 +4381,29 @@ class adminDelCommand : public Command {
   }
 } admindelCmd;
 
+class JeprofCommand : public Command {
+ public:
+  JeprofCommand() : Command("jeprof", "a") {}
+
+  ssize_t arity() const {
+    return 1;
+  }
+
+  int32_t firstkey() const {
+    return 0;
+  }
+
+  int32_t lastkey() const {
+    return 0;
+  }
+
+  int32_t keystep() const {
+    return 0;
+  }
+  Expected<std::string> run(Session* sess) final {
+    mallctl("prof.dump", NULL, NULL, NULL, 0);
+    return Command::fmtOK();
+  }
+} jeprofCommand;
+
 }  // namespace tendisplus