Add jemalloc heap profilling in debug console

lualib-src/lua-memory.c

@@ -49,6 +49,26 @@ lcurrent(lua_State *L) {
 	return 1;
 }
 
+static int
+ldumpheap(lua_State *L) {
+	mallctl_cmd("prof.dump");
+	return 0;
+}
+
+static int
+lprofactive(lua_State *L) {
+	bool *pval, active;
+	if (lua_isnone(L, 1)) {
+		pval = NULL;
+	} else {
+		active = lua_toboolean(L, 1) ? true : false;
+		pval = &active;
+	}
+	bool ret = mallctl_bool("prof.active", pval);
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
 LUAMOD_API int
 luaopen_skynet_memory(lua_State *L) {
 	luaL_checkversion(L);
@@ -62,6 +82,8 @@ luaopen_skynet_memory(lua_State *L) {
 		{ "ssinfo", luaS_shrinfo },
 		{ "ssexpand", lexpandshrtbl },
 		{ "current", lcurrent },
+		{ "dumpheap", ldumpheap },
+		{ "profactive", lprofactive },
 		{ NULL, NULL },
 	};
 

service/debug_console.lua

@@ -160,6 +160,8 @@ function COMMAND.help()
 		call = "call address ...",
 		trace = "trace address [proto] [on|off]",
 		netstat = "netstat : show netstat",
+		profactive = "profactive [on|off] : active/deactive jemalloc heap profilling",
+		dumpheap = "dumpheap : dump heap profilling",
 	}
 end
 
@@ -422,3 +424,18 @@ function COMMAND.netstat()
 	end
 	return stat
 end
+
+function COMMAND.dumpheap()
+	memory.dumpheap()
+end
+
+function COMMAND.profactive(flag)
+	if flag ~= nil then
+		if flag == "on" or flag == "off" then
+			flag = toboolean(flag)
+		end
+		memory.profactive(flag)
+	end
+	local active = memory.profactive()
+	return "heap profilling is ".. (active and "active" or "deactive")
+end

skynet-src/malloc_hook.c

@@ -131,6 +131,23 @@ memory_info_dump(void) {
 	je_malloc_stats_print(0,0,0);
 }
 
+bool
+mallctl_bool(const char* name, bool* newval) {
+	bool v = 0;
+	size_t len = sizeof(v);
+	if(newval) {
+		je_mallctl(name, &v, &len, newval, sizeof(bool));
+	} else {
+		je_mallctl(name, &v, &len, NULL, 0);
+	}
+	return v;
+}
+
+int
+mallctl_cmd(const char* name) {
+	return je_mallctl(name, NULL, NULL, NULL, 0);
+}
+
 size_t
 mallctl_int64(const char* name, size_t* newval) {
 	size_t v = 0;

skynet-src/malloc_hook.h

@@ -2,6 +2,7 @@
 #define SKYNET_MALLOC_HOOK_H
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include <lua.h>
 
 extern size_t malloc_used_memory(void);
@@ -9,6 +10,8 @@ extern size_t malloc_memory_block(void);
 extern void   memory_info_dump(void);
 extern size_t mallctl_int64(const char* name, size_t* newval);
 extern int    mallctl_opt(const char* name, int* newval);
+extern bool   mallctl_bool(const char* name, bool* newval);
+extern int    mallctl_cmd(const char* name);
 extern void   dump_c_mem(void);
 extern int    dump_mem_lua(lua_State *L);
 extern size_t malloc_current_memory(void);