From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, imun@tarantool.org, skaplun@tarantool.org Subject: [Tarantool-patches] [PATCH luajit v2] memprof: introduce cli flag to run dump parser Date: Sun, 12 Sep 2021 17:51:18 +0300 [thread overview] Message-ID: <20210912145118.392561-1-m.kokryashkin@tarantool.org> (raw) It is really unconvinient to use a standalone shell script to parse memprof dump. That is why this commit intoroduces a CLI flag for tools to the LuaJIT, so now it is possible to parse memprof dump as simple as: ``` luajit -tm memprof.bin ``` Closes tarantool/tarantool#5688 --- GitHub branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5688-cli-for-memprof-parse Issue: https://github.com/tarantool/tarantool/issues/5688 Also, I am not sure whether it is ok to do that[1] trick with `argn` or not. It seems reasonable to run tools using the `runargs` method, but then the `argn` should be adjusted in a such way, that the `createargtable` will save parameters for the tool and 'runargs' will execute the script itself. [1]: https://github.com/tarantool/luajit/blob/8c074ebe7336a27f15484f1bb7eff757fa92c2f4/src/luajit.c#L565 CMakeLists.txt | 9 ++++---- src/CMakeLists.txt | 5 +++++ src/lj_tools_conf.h.in | 6 ++++++ src/luajit.c | 49 ++++++++++++++++++++++++++++++++---------- tools/CMakeLists.txt | 2 ++ 5 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 src/lj_tools_conf.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 5348e043..74826095 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,6 +250,11 @@ endif() # related compiler and linker flags passed. This should be done # the right way later. +# --- Tools -------------------------------------------------------------------- + +add_subdirectory(tools) +set(LUAJIT_TOOLS_DIR "${LUAJIT_TOOLS_DIR}") + # --- Main source tree --------------------------------------------------------- add_subdirectory(src) @@ -258,10 +263,6 @@ add_subdirectory(src) add_subdirectory(etc) -# --- Tools -------------------------------------------------------------------- - -add_subdirectory(tools) - # --- Testing source tree ------------------------------------------------------ # Auxiliary options for testing. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 809aac68..d9debccf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -142,6 +142,8 @@ make_source_list(SOURCES_CORE_NO_JIT_FFI ${SOURCES_UTILS} ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lj_tools_conf.h.in ${CMAKE_CURRENT_SOURCE_DIR}/lj_tools_conf.h) + set(SOURCES_CORE ${SOURCES_CORE_NO_JIT_FFI}) # Build JIT sources if JIT support is enabled. @@ -248,6 +250,9 @@ add_custom_target( jit/vmdef.lua ) +# --- Generate luajit tools config header ------------------------------------- +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lj_tools_conf.h.in ${CMAKE_CURRENT_SOURCE_DIR}/lj_tools_conf.h) + # --- Generate core and VM object files --------------------------------------- # Virtual machine. diff --git a/src/lj_tools_conf.h.in b/src/lj_tools_conf.h.in new file mode 100644 index 00000000..366c3ec4 --- /dev/null +++ b/src/lj_tools_conf.h.in @@ -0,0 +1,6 @@ +#ifndef LJ_TOOLS_CONF_H +#define LJ_TOOLS_CONF_H + +#define PARSER_PATH "@LUAJIT_TOOLS_DIR@/memprof.lua" + +#endif diff --git a/src/luajit.c b/src/luajit.c index 1ca24301..525797a5 100644 --- a/src/luajit.c +++ b/src/luajit.c @@ -19,6 +19,8 @@ #include "lj_arch.h" +#include "lj_tools_conf.h" + #if LJ_TARGET_POSIX #include <unistd.h> #define lua_stdin_is_tty() isatty(0) @@ -72,6 +74,7 @@ static void print_usage(void) " -O[opt] Control LuaJIT optimizations.\n" " -i Enter interactive mode after executing " LUA_QL("script") ".\n" " -v Show version information.\n" + " -t[cmd] Execute tool.\n" " -E Ignore environment variables.\n" " -- Stop handling options.\n" " - Execute stdin and stop handling options.\n", stderr); @@ -266,21 +269,17 @@ static void dotty(lua_State *L) progname = oldprogname; } -static int handle_script(lua_State *L, char **argx) +static int call_script(lua_State *L, const char *fname) { - int status; - const char *fname = argx[0]; - if (strcmp(fname, "-") == 0 && strcmp(argx[-1], "--") != 0) - fname = NULL; /* stdin */ - status = luaL_loadfile(L, fname); + int status = luaL_loadfile(L, fname); if (status == LUA_OK) { /* Fetch args from arg table. LUA_INIT or -e might have changed them. */ int narg = 0; lua_getglobal(L, "arg"); if (lua_istable(L, -1)) { do { - narg++; - lua_rawgeti(L, -narg, narg); + narg++; + lua_rawgeti(L, -narg, narg); } while (!lua_isnil(L, -1)); lua_pop(L, 1); lua_remove(L, -narg); @@ -290,6 +289,16 @@ static int handle_script(lua_State *L, char **argx) } status = docall(L, narg, 0); } + return status; +} + +static int handle_script(lua_State *L, char **argx) +{ + int status; + const char *fname = argx[0]; + if (strcmp(fname, "-") == 0 && strcmp(argx[-1], "--") != 0) + fname = NULL; /* stdin */ + status = call_script(L, fname); return report(L, status); } @@ -361,6 +370,15 @@ static int dojitcmd(lua_State *L, const char *cmd) return runcmdopt(L, opt ? opt+1 : opt); } +static int dotoolcmd(lua_State *L, const char *cmd) +{ + if(strcmp(cmd, "m") == 0) { + const int status = call_script(L, PARSER_PATH); + return status == LUA_OK; + } + return -1; +} + /* Optimization flags. */ static int dojitopt(lua_State *L, const char *opt) { @@ -398,6 +416,7 @@ static int dobytecode(lua_State *L, char **argv) #define FLAGS_EXEC 4 #define FLAGS_OPTION 8 #define FLAGS_NOENV 16 +#define FLAGS_TOOL 32 static int collectargs(char **argv, int *flags) { @@ -419,14 +438,19 @@ static int collectargs(char **argv, int *flags) notail(argv[i]); *flags |= FLAGS_VERSION; break; + case 't': + *flags |= FLAGS_TOOL; + if (argv[i][2] == '\0') return -1; + if (argv[i + 1] == NULL) return -1; + return i + 1; case 'e': *flags |= FLAGS_EXEC; case 'j': /* LuaJIT extension */ case 'l': *flags |= FLAGS_OPTION; if (argv[i][2] == '\0') { - i++; - if (argv[i] == NULL) return -1; + i++; + if (argv[i] == NULL) return -1; } break; case 'O': break; /* LuaJIT extension */ @@ -474,6 +498,9 @@ static int runargs(lua_State *L, char **argv, int argn) return 1; break; } + case 't' : + const char *cmd = argv[i] + 2; + return dotoolcmd(L, cmd) == LUA_OK; case 'O': /* LuaJIT extension. */ if (dojitopt(L, argv[i] + 2)) return 1; @@ -535,7 +562,7 @@ static int pmain(lua_State *L) luaL_openlibs(L); lua_gc(L, LUA_GCRESTART, -1); - createargtable(L, argv, s->argc, argn); + createargtable(L, argv, s->argc, (flags & FLAGS_TOOL) ? argn - 1 : argn); if (!(flags & FLAGS_NOENV)) { s->status = handle_luainit(L); diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 61830e44..84129153 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -16,6 +16,7 @@ else() # path where LuaJIT binary is located. set(LUAJIT_TOOLS_BIN ${LUAJIT_BINARY_DIR}/${LUAJIT_CLI_NAME}) set(LUAJIT_TOOLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + set(LUAJIT_TOOLS_DIR ${LUAJIT_TOOLS_DIR} PARENT_SCOPE) # XXX: Unfortunately, there is no convenient way to set # particular permissions to the output file via CMake. # Furthermore, I even failed to copy the given file to the same @@ -75,6 +76,7 @@ else() " set(LUAJIT_TOOLS_BIN ${CMAKE_INSTALL_PREFIX}/bin/${LUAJIT_CLI_NAME}) set(LUAJIT_TOOLS_DIR ${CMAKE_INSTALL_PREFIX}/${LUAJIT_DATAROOTDIR}) + set(LUAJIT_TOOLS_DIR ${LUAJIT_TOOLS_DIR} PARENT_SCOPE) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/luajit-parse-memprof.in ${PROJECT_BINARY_DIR}/luajit-parse-memprof @ONLY ESCAPE_QUOTES) file(INSTALL ${PROJECT_BINARY_DIR}/luajit-parse-memprof -- 2.33.0
next reply other threads:[~2021-09-12 14:51 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-12 14:51 Maxim Kokryashkin via Tarantool-patches [this message] 2022-11-29 13:18 ` Sergey Kaplun via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210912145118.392561-1-m.kokryashkin@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit v2] memprof: introduce cli flag to run dump parser' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox