From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 7DC9BDC5BB9; Wed, 13 Mar 2024 17:41:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7DC9BDC5BB9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1710340884; bh=F1XlZQA2Qy4lNbInLRb56CGGjz41nv16GbEX0nCTP8Y=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=AT5CUBOcvI0N/1Yo7LUHb3sQD/ttWduDOOG0WazwM7M4/aiI9+KXCzneF7XT5Y26v kQw19kIgIYAoQY7ArqHmZZ1JQeRWoqXwIBF2cD97Aru9Uac56G/2i5NmMUNPP7WVvC fISQ4fcllXl+rnRBZcQ6cakVGDqt2rpjpILSeKF0= Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id B2B65DC5BAD for ; Wed, 13 Mar 2024 17:40:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B2B65DC5BAD Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2d46d729d89so8188251fa.3 for ; Wed, 13 Mar 2024 07:40:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710340825; x=1710945625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LiPrLDCWOUudkgE4UVZd1G+ZnjSgNDfpazIyoz35/qU=; b=iT8k2p8Ubu1loSGZut8BTf3F3SB1RkwyGw+vA63KIB2sq5gPu3adoqKa8c31Q5KKI1 ymcynIUOGlf2fKFTBT046v7oTGWcTwODpuUv4oZm/XOfcgL8sKAi22swXsN+3AqhvbQl 4eG7bssfwZaXPx/4UvzriNiL7Rsam9xkvKj2hXiNOMw77hwyo1wAYR1cpo3rk144/4KD uz5YdHXRXC0236h8ukePnxread6S1bgiCyeBuIkn9P3w1m1QfpP3mxCpD+mlaWttr5B6 8BRh/hLlTSBImiu2eLsfMaM8BDLipRcdrJr+iBViDcECmnd/oUZmhN6e7DxbRwlAqGaU xE0g== X-Gm-Message-State: AOJu0YyRhAQ1b3hr0+2edjV0KIcBbmdp9kkcfu80ZuWLj+S6ycK/oLs6 fqRSmpi68GqU/TIsIq0wY/3Js2QBquSQHGwGgQYPJvYqcQgyBgzlG1o3xDu7uQ8= X-Google-Smtp-Source: AGHT+IF77uPIqibAYnnHpughYGSMnzrNoWatNYnSy6ioRUrTapTa+Q4HAGH+d3tJslUf1LntVEvHDQ== X-Received: by 2002:a2e:8013:0:b0:2d4:6814:7c98 with SMTP id j19-20020a2e8013000000b002d468147c98mr2295399ljg.43.1710340825515; Wed, 13 Mar 2024 07:40:25 -0700 (PDT) Received: from localhost.localdomain (95-24-11-149.broadband.corbina.ru. [95.24.11.149]) by smtp.gmail.com with ESMTPSA id a14-20020a2e88ce000000b002d4692a51c8sm505450ljk.99.2024.03.13.07.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 07:40:25 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Date: Wed, 13 Mar 2024 17:40:14 +0300 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v3 2/6] build: fix tool components handling X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 | 16 ++++++++++++---- tools/CMakeLists.txt | 4 ++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile.original b/Makefile.original index e67b6aa8..d0834fe6 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,8 +98,9 @@ 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_TOOLSLIB= memprof.lua +FILES_MEMPROFLIB= humanize.lua parse.lua process.lua +FILES_SYSPROFLIB= parse.lua +FILES_TOOLSLIB= memprof.lua sysprof.lua ifeq (,$(findstring Windows,$(OS))) HOST_SYS:= $(shell uname -s) @@ -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.44.0