From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Subject: [Tarantool-patches] [PATCH luajit v2 2/6] build: fix tool components handling Date: Wed, 6 Dec 2023 21:55:17 +0300 [thread overview] Message-ID: <3d34441cd94210ab916527ce95c8cba0ef1b8f4f.1701888856.git.m.kokryashkin@tarantool.org> (raw) In-Reply-To: <cover.1701888856.git.m.kokryashkin@tarantool.org> Prior to this patch, memprof/process.lua wasn't added to the dependency list as a part of the memprof parser sources. Also, it wasn't installed into the system along with other memprof sources, which breaks the profile parser. Also, the sysprof parser sources weren't handled by the Makefile.original at all. The same applies to utils/avl.lua. This patch fixes that, so now it's possible to properly handle sysprof's parser. Part of tarantool/tarantool#5994 --- Makefile.original | 14 +++++++++++--- tools/CMakeLists.txt | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile.original b/Makefile.original index e67b6aa8..2a56d648 100644 --- a/Makefile.original +++ b/Makefile.original @@ -40,6 +40,7 @@ INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit INSTALL_TOOLSLIB= $(INSTALL_LJLIBD) INSTALL_UTILSLIB= $(INSTALL_TOOLSLIB)/utils INSTALL_MEMPROFLIB= $(INSTALL_TOOLSLIB)/memprof +INSTALL_SYSPROFLIB= $(INSTALL_TOOLSLIB)/sysprof INSTALL_LMODD= $(INSTALL_SHARE)/lua INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) INSTALL_CMODD= $(INSTALL_LIB)/lua @@ -68,10 +69,12 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) \ - $(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_TOOLSLIB) + $(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_SYSPROFLIB) \ + $(INSTALL_TOOLSLIB) UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) \ - $(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_TOOLSLIB) + $(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_SYSPROFLIB) \ + $(INSTALL_TOOLSLIB) RM= rm -f MKDIR= mkdir -p @@ -95,7 +98,8 @@ FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \ dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \ dis_mips64.lua dis_mips64el.lua vmdef.lua FILES_UTILSLIB= avl.lua bufread.lua symtab.lua -FILES_MEMPROFLIB= parse.lua humanize.lua +FILES_MEMPROFLIB= parse.lua humanize.lua process.lua +FILES_SYSPROFLIB= parse.lua FILES_TOOLSLIB= memprof.lua ifeq (,$(findstring Windows,$(OS))) @@ -140,6 +144,7 @@ install: $(INSTALL_DEP) cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB) cd tools/utils && $(INSTALL_F) $(FILES_UTILSLIB) $(INSTALL_UTILSLIB) cd tools/memprof && $(INSTALL_F) $(FILES_MEMPROFLIB) $(INSTALL_MEMPROFLIB) + cd tools/sysprof && $(INSTALL_F) $(FILES_SYSPROFLIB) $(INSTALL_SYSPROFLIB) cd tools && $(INSTALL_F) $(FILES_TOOLSLIB) $(INSTALL_TOOLSLIB) @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ====" @echo "" @@ -162,6 +167,9 @@ uninstall: for file in $(FILES_MEMPROFLIB); do \ $(UNINSTALL) $(INSTALL_MEMPROFLIB)/$$file; \ done + for file in $(FILES_SYSPROFLIB); do \ + $(UNINSTALL) $(INSTALL_SYSPROFLIB)/$$file; \ + done for file in $(FILES_TOOLSLIB); do \ $(UNINSTALL) $(INSTALL_TOOLSLIB)/$$file; \ done diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 1dfc39e4..a4adc15b 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -14,6 +14,7 @@ else() add_custom_target(tools-parse-memprof EXCLUDE_FROM_ALL DEPENDS memprof/humanize.lua memprof/parse.lua + memprof/process.lua memprof.lua utils/avl.lua utils/bufread.lua @@ -24,6 +25,7 @@ else() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/memprof/humanize.lua ${CMAKE_CURRENT_SOURCE_DIR}/memprof/parse.lua + ${CMAKE_CURRENT_SOURCE_DIR}/memprof/process.lua DESTINATION ${LUAJIT_DATAROOTDIR}/memprof PERMISSIONS OWNER_READ OWNER_WRITE @@ -61,6 +63,7 @@ else() add_custom_target(tools-parse-sysprof EXCLUDE_FROM_ALL DEPENDS sysprof/parse.lua sysprof.lua + utils/avl.lua utils/bufread.lua utils/symtab.lua ) @@ -76,6 +79,7 @@ else() COMPONENT tools-parse-sysprof ) install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/utils/avl.lua ${CMAKE_CURRENT_SOURCE_DIR}/utils/bufread.lua ${CMAKE_CURRENT_SOURCE_DIR}/utils/symtab.lua DESTINATION ${LUAJIT_DATAROOTDIR}/utils -- 2.43.0
next prev parent reply other threads:[~2023-12-06 18:56 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-12-06 18:55 [Tarantool-patches] [PATCH luajit v2 0/6] profilers: refactor parsers Maxim Kokryashkin via Tarantool-patches 2023-12-06 18:55 ` [Tarantool-patches] [PATCH luajit v2 1/6] build: purge sysprof.collapse module Maxim Kokryashkin via Tarantool-patches 2023-12-12 10:18 ` Sergey Kaplun via Tarantool-patches 2023-12-19 12:20 ` Sergey Bronnikov via Tarantool-patches 2023-12-06 18:55 ` Maxim Kokryashkin via Tarantool-patches [this message] 2023-12-12 10:32 ` [Tarantool-patches] [PATCH luajit v2 2/6] build: fix tool components handling Sergey Kaplun via Tarantool-patches 2023-12-12 12:53 ` Maxim Kokryashkin via Tarantool-patches 2023-12-12 12:51 ` Sergey Kaplun via Tarantool-patches 2023-12-19 13:56 ` Sergey Bronnikov via Tarantool-patches 2023-12-06 18:55 ` [Tarantool-patches] [PATCH luajit v2 3/6] memprof: refactor `heap_chunk` data structure Maxim Kokryashkin via Tarantool-patches 2023-12-12 10:34 ` Sergey Kaplun via Tarantool-patches 2023-12-19 14:00 ` Sergey Bronnikov via Tarantool-patches 2023-12-06 18:55 ` [Tarantool-patches] [PATCH luajit v2 4/6] memprof: remove unused arguments Maxim Kokryashkin via Tarantool-patches 2023-12-12 10:44 ` Sergey Kaplun via Tarantool-patches 2023-12-19 14:01 ` Sergey Bronnikov via Tarantool-patches 2023-12-06 18:55 ` [Tarantool-patches] [PATCH luajit v2 5/6] memprof: introduce the `--human-readable` option Maxim Kokryashkin via Tarantool-patches 2023-12-12 10:54 ` Sergey Kaplun via Tarantool-patches 2023-12-20 12:24 ` Sergey Bronnikov via Tarantool-patches 2023-12-06 18:55 ` [Tarantool-patches] [PATCH luajit v2 6/6] profilers: print user-friendly errors Maxim Kokryashkin via Tarantool-patches 2023-12-12 11:51 ` Sergey Kaplun via Tarantool-patches 2023-12-12 12:54 ` Maxim Kokryashkin via Tarantool-patches 2023-12-12 12:54 ` Sergey Kaplun via Tarantool-patches 2023-12-29 12:27 ` Sergey Bronnikov via Tarantool-patches 2024-01-09 13:54 ` Maxim Kokryashkin via Tarantool-patches 2024-01-16 9:48 ` Sergey Bronnikov 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=3d34441cd94210ab916527ce95c8cba0ef1b8f4f.1701888856.git.m.kokryashkin@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit v2 2/6] build: fix tool components handling' \ /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