Skip to content

Commit 3764010

Browse files
committed
build: fix tool components handling
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
1 parent 3fe1c00 commit 3764010

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Makefile.original

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
4040
INSTALL_TOOLSLIB= $(INSTALL_LJLIBD)
4141
INSTALL_UTILSLIB= $(INSTALL_TOOLSLIB)/utils
4242
INSTALL_MEMPROFLIB= $(INSTALL_TOOLSLIB)/memprof
43+
INSTALL_SYSPROFLIB= $(INSTALL_TOOLSLIB)/sysprof
4344
INSTALL_LMODD= $(INSTALL_SHARE)/lua
4445
INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
4546
INSTALL_CMODD= $(INSTALL_LIB)/lua
@@ -68,10 +69,12 @@ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
6869

6970
INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
7071
$(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) \
71-
$(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_TOOLSLIB)
72+
$(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_SYSPROFLIB) \
73+
$(INSTALL_TOOLSLIB)
7274
UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
7375
$(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) \
74-
$(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_TOOLSLIB)
76+
$(INSTALL_UTILSLIB) $(INSTALL_MEMPROFLIB) $(INSTALL_SYSPROFLIB) \
77+
$(INSTALL_TOOLSLIB)
7578

7679
RM= rm -f
7780
MKDIR= mkdir -p
@@ -95,8 +98,9 @@ FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
9598
dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
9699
dis_mips64.lua dis_mips64el.lua vmdef.lua
97100
FILES_UTILSLIB= avl.lua bufread.lua symtab.lua
98-
FILES_MEMPROFLIB= parse.lua humanize.lua
99-
FILES_TOOLSLIB= memprof.lua
101+
FILES_MEMPROFLIB= humanize.lua parse.lua process.lua
102+
FILES_SYSPROFLIB= parse.lua
103+
FILES_TOOLSLIB= memprof.lua sysprof.lua
100104

101105
ifeq (,$(findstring Windows,$(OS)))
102106
HOST_SYS:= $(shell uname -s)
@@ -140,6 +144,7 @@ install: $(INSTALL_DEP)
140144
cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
141145
cd tools/utils && $(INSTALL_F) $(FILES_UTILSLIB) $(INSTALL_UTILSLIB)
142146
cd tools/memprof && $(INSTALL_F) $(FILES_MEMPROFLIB) $(INSTALL_MEMPROFLIB)
147+
cd tools/sysprof && $(INSTALL_F) $(FILES_SYSPROFLIB) $(INSTALL_SYSPROFLIB)
143148
cd tools && $(INSTALL_F) $(FILES_TOOLSLIB) $(INSTALL_TOOLSLIB)
144149
@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
145150
@echo ""
@@ -162,6 +167,9 @@ uninstall:
162167
for file in $(FILES_MEMPROFLIB); do \
163168
$(UNINSTALL) $(INSTALL_MEMPROFLIB)/$$file; \
164169
done
170+
for file in $(FILES_SYSPROFLIB); do \
171+
$(UNINSTALL) $(INSTALL_SYSPROFLIB)/$$file; \
172+
done
165173
for file in $(FILES_TOOLSLIB); do \
166174
$(UNINSTALL) $(INSTALL_TOOLSLIB)/$$file; \
167175
done

tools/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ else()
1414
add_custom_target(tools-parse-memprof EXCLUDE_FROM_ALL DEPENDS
1515
memprof/humanize.lua
1616
memprof/parse.lua
17+
memprof/process.lua
1718
memprof.lua
1819
utils/avl.lua
1920
utils/bufread.lua
@@ -24,6 +25,7 @@ else()
2425
install(FILES
2526
${CMAKE_CURRENT_SOURCE_DIR}/memprof/humanize.lua
2627
${CMAKE_CURRENT_SOURCE_DIR}/memprof/parse.lua
28+
${CMAKE_CURRENT_SOURCE_DIR}/memprof/process.lua
2729
DESTINATION ${LUAJIT_DATAROOTDIR}/memprof
2830
PERMISSIONS
2931
OWNER_READ OWNER_WRITE
@@ -61,6 +63,7 @@ else()
6163
add_custom_target(tools-parse-sysprof EXCLUDE_FROM_ALL DEPENDS
6264
sysprof/parse.lua
6365
sysprof.lua
66+
utils/avl.lua
6467
utils/bufread.lua
6568
utils/symtab.lua
6669
)
@@ -76,6 +79,7 @@ else()
7679
COMPONENT tools-parse-sysprof
7780
)
7881
install(FILES
82+
${CMAKE_CURRENT_SOURCE_DIR}/utils/avl.lua
7983
${CMAKE_CURRENT_SOURCE_DIR}/utils/bufread.lua
8084
${CMAKE_CURRENT_SOURCE_DIR}/utils/symtab.lua
8185
DESTINATION ${LUAJIT_DATAROOTDIR}/utils

0 commit comments

Comments
 (0)