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 BBEF1727D0E; Wed, 6 Dec 2023 21:56:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BBEF1727D0E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1701888988; bh=HZBPVeQpeg3mANk0J828FeP4gvWqHNEKS/gPl14MVbM=; 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=WBe6gCjktge7U0k0QNOvAaGE1xDCcjR8jk/M+2S0zam13HaBZf3n4jX2cMarm7fSa kE+IdXJV5+U3Ox4yRx2903TckV8ZjEJq21bFj4kn6H7lXAcm6MoRX67BgQ08W0pE93 Q8BX+/nCZRqV+oJ4vVGoBJ3m/TWQ5mw+th/l453s= Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 CA494727D0E for ; Wed, 6 Dec 2023 21:55:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CA494727D0E Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-50bfa5a6cffso135129e87.0 for ; Wed, 06 Dec 2023 10:55:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701888929; x=1702493729; 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=pAiLb7bweysGC+/xEsckJzs0rEcgO2nm09rz2urNUTM=; b=WJxYLVLZNj83klWNvpYqz/OjTgVsOQPAxhgdBZk6gHOtpJQCHUSWznQ+tr2jZIB1aA Dx6WayrluVD3qx9CG8fi71jlO98ipMjSIaDs9CqHk9tONQflvAG8BzCEqsiJMUqz5/su ik+synSmpRPcMNs5uDEluTEOTjv4Vp99Al8/d+eHuA31pr1JWqcw28LNwZ+zhCR2lM+X nAvqxVg0BuU7aNbP3p88jE1TwHwBxKVF0C0SS1WDO+6bEJsE9midQL3oaWaa7nS2tS6B KtKp3bYPUzCKgV7dC6Et6EE9V1ZBPYlxDhyeZeh9LC2p7ky4KheDA3v2n1emBwy7XRy4 tlZw== X-Gm-Message-State: AOJu0YyrnqfLmu/dpmCnNFY3BrPxgHVcxeVVlFgN04E9F4GKIjPm7DPL GHKftE8n4j5KOYgGEArHlqEkqBmzkTL/6Q== X-Google-Smtp-Source: AGHT+IE91Z+GZ96GQCodEqfnI27R+tS94v0YXHJsbiuhiF9Wk2gys/8YTLB5ivwsm9I8hyv6VhVkKg== X-Received: by 2002:ac2:48a2:0:b0:50c:d80:85e6 with SMTP id u2-20020ac248a2000000b0050c0d8085e6mr839138lfg.54.1701888928638; Wed, 06 Dec 2023 10:55:28 -0800 (PST) Received: from localhost.localdomain (95-24-1-238.broadband.corbina.ru. [95.24.1.238]) by smtp.gmail.com with ESMTPSA id t23-20020a199117000000b0050c0320f167sm606367lfd.245.2023.12.06.10.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 10:55:28 -0800 (PST) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Date: Wed, 6 Dec 2023 21:55:17 +0300 Message-ID: <3d34441cd94210ab916527ce95c8cba0ef1b8f4f.1701888856.git.m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v2 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 | 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