From patchwork Wed Nov 10 14:37:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 12612225 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01D19C433EF for ; Wed, 10 Nov 2021 14:38:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE03061106 for ; Wed, 10 Nov 2021 14:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232185AbhKJOk7 (ORCPT ); Wed, 10 Nov 2021 09:40:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231743AbhKJOk7 (ORCPT ); Wed, 10 Nov 2021 09:40:59 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62301C061764 for ; Wed, 10 Nov 2021 06:38:11 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id b15so11290497edd.7 for ; Wed, 10 Nov 2021 06:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3q8iXzB4/auFLv5PTm6ro10W6p7lz/8VSeh9ER9VxAA=; b=a3upig0hOy0rCEayHyORTJe1vXrq0FNs1fMwNgjyaffOvfwm7TrZeVN2VqhaK7xbby gQTHSrFnOmnFDwhY7oGUbb/dx3/SKjY1bsHYgBY6v+AjiOR0cLu06Q5/3qfy8IF3cUF3 2q3BqMUvMBizbdg4M24p4aTVP015w2OrvW+g+VUn4JbTYnL4HXNE7ECWDDDAGrF7WohZ CnHyDmg2D/nOdA81VB+inlTr1Id3Ox7FFgLjY+2zMVNyLVfAdUPhtdnn6R/ZqohXqiAt x0z6p8voTkthxxN24jrw4iFuMdM6KBKuK4QgEj3Ywj0KZpEXu3vZCAugbMTxdQEwV5kt jl3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3q8iXzB4/auFLv5PTm6ro10W6p7lz/8VSeh9ER9VxAA=; b=PhhI6ltPcCZUAPPKa6d/2YcEWa16g7X4VnQlf7x1HcXP7BbldvO9RWbx8iDIPc0wOf 7evVq/msLqNiYWrnU/DMjkr/s/A9rF0Vh9+USEl1udrXyDVL75UZy24WRBWrKac1317v SrCz0yErqKb2CUCksQE70JN+kZStMW1bQQn7uh1nFwQ3uxwaEkwMa3prUTdwGr81qVVn Xfh9L2mEI9M0pjKNY6PXY09XoRAmGyvhkI6PKxIiXfNY0q8tdhf9oIZHwxX8uhNhFzwa ItAoyR0JG1p5bUp829S69dHMZ8K/rSQ5G5SXRxLp4c2YPkiWjplVPchrKRN7vkeceSH/ id2g== X-Gm-Message-State: AOAM5319GEyW0kMXHPzHs1X41u97m86gCdBkJRQKFKhX8YUSNz54gU9h 9pkaZZ0FzOZQITGnOJ9E3DQurBFIcTU= X-Google-Smtp-Source: ABdhPJxX68LQYpryRj+l+mp0Qj3W2cDyaEx0UgOKak2ulWf/x+xkg0yIEDulj1ANmjcMTrmm/KF8PQ== X-Received: by 2002:aa7:d90e:: with SMTP id a14mr97345edr.252.1636555089316; Wed, 10 Nov 2021 06:38:09 -0800 (PST) Received: from crow.. ([95.87.219.163]) by smtp.gmail.com with ESMTPSA id hc10sm11477039ejc.99.2021.11.10.06.38.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:38:08 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: linux-trace-devel@vger.kernel.org Cc: "Yordan Karadzhov (VMware)" Subject: [PATCH 1/5] kernel-shark: Silence a warning from 'cmake_clean.sh' Date: Wed, 10 Nov 2021 16:37:43 +0200 Message-Id: <20211110143747.32833-1-y.karadz@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The file 'CTestTestfile.cmake' may not exist if the CI tests were never executed. Signed-off-by: Yordan Karadzhov (VMware) --- build/cmake_clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake_clean.sh b/build/cmake_clean.sh index d645c32..8defa67 100755 --- a/build/cmake_clean.sh +++ b/build/cmake_clean.sh @@ -2,7 +2,7 @@ make clean rm CMakeCache.txt rm cmake_install.cmake rm Makefile -rm CTestTestfile.cmake +rm -f CTestTestfile.cmake rm -f DartConfiguration.tcl rm -rf CMakeFiles/ rm -rf src/ From patchwork Wed Nov 10 14:37:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 12612223 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 478D9C433F5 for ; Wed, 10 Nov 2021 14:38:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C3AB6121F for ; Wed, 10 Nov 2021 14:38:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231743AbhKJOlA (ORCPT ); Wed, 10 Nov 2021 09:41:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232182AbhKJOk7 (ORCPT ); Wed, 10 Nov 2021 09:40:59 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99693C061766 for ; Wed, 10 Nov 2021 06:38:11 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id c8so11193238ede.13 for ; Wed, 10 Nov 2021 06:38:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W2ebLlhHxVhhVL8MbhAGySkyrDECmVtwrd8UGJwQoGM=; b=IvZf/NFyAwPx0nwrgdwDnqaSh0n+p1kwFKgfEj/vpbMg/h1tyqAC7Ji8J6NrG9YZTl q9DPDvOxdH6NPjjEY0eLdLhOcRz/MwuB3Hc2a9rIzLKVXRjEQkgSmULxlnNWkXchbU9Y bpXNQfCv/jN0YqbYnz0sKPbJ5dwHQXHe9kwgKv5TyiWLlnh0xp+dN0ts/l3b8wN2FLVk 1X+tyOxBX6jzOTqkq0ugKpicBf9UgOqbiUpPj2SuGLDA+jhn7zjSqDarlxa8HpKehLiq 1GihZlMPGnOmiFumAIK3Nbl8Ne7zjBVYjmp/CvV0heMV5BNqD8lIuNHqmWyfJdk/NVRt Uj0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W2ebLlhHxVhhVL8MbhAGySkyrDECmVtwrd8UGJwQoGM=; b=ZYuJAbinGPazEp8c3DZVnFpOQeGsFspjlnmd34o05KZb1it9/N857tNfSptj6Ovkix kbGTWB7h9KpYW28TAjiWoMQZivwbm4BrWRdjcLija8HpFHRnRj/Z6+l2EIz2ZFaoKc9I SJ7+GRnhnx7of94XE4IDzu43wASWf+8FnfJzndJeDVzu5UKIvBcUYFYQVyW46aQ8BMWh U3v6OupREvHUJtpnC/8ZHDDBzKuY0nL9vpWdfz9i3Hxl6zxfdvycntSXZT66igPNPlnf JrYIYFS75GUHKIbbJ922gD+I5rCsdx5m1mgc+QTEZi7Nx+Uk4luCLR6PIRL1v/pnaq5P zteA== X-Gm-Message-State: AOAM53282tzgzcsbEZL5eOOxhueuchhUNrHd5vCZ+3et/wdf57IlpmG6 tqrZmZYUrnnfPUif60LoZ9SL07MRO9M= X-Google-Smtp-Source: ABdhPJwZCFmdJWAcuv+OAyY6QUgFq042Ct5FthSg53K0puBQUxva5jCOmt3XPC4JSLcGu0Mun3t9Fg== X-Received: by 2002:a05:6402:51cc:: with SMTP id r12mr147825edd.64.1636555090056; Wed, 10 Nov 2021 06:38:10 -0800 (PST) Received: from crow.. ([95.87.219.163]) by smtp.gmail.com with ESMTPSA id hc10sm11477039ejc.99.2021.11.10.06.38.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:38:09 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: linux-trace-devel@vger.kernel.org Cc: "Yordan Karadzhov (VMware)" Subject: [PATCH 2/5] kernel-shark: Fix a warning from 'KsUtils.cpp' Date: Wed, 10 Nov 2021 16:37:44 +0200 Message-Id: <20211110143747.32833-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211110143747.32833-1-y.karadz@gmail.com> References: <20211110143747.32833-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org gcc 11.2.1 prints the following warning: KsUtils.cpp:573:41: warning: loop variable 'task' creates a copy from type 'const QString' [-Wrange-loop-construct] Signed-off-by: Yordan Karadzhov (VMware) --- src/KsUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/KsUtils.cpp b/src/KsUtils.cpp index 364c25d..a22c445 100644 --- a/src/KsUtils.cpp +++ b/src/KsUtils.cpp @@ -570,7 +570,7 @@ QMap> parseTaskList(QString v_str) if (name.isEmpty()) continue; - for (auto const task: taskList) { + for (auto const &task: taskList) { if(name == task) ret[sd].append(pid); } From patchwork Wed Nov 10 14:37:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 12612229 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7F1FC4332F for ; Wed, 10 Nov 2021 14:38:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A69466121F for ; Wed, 10 Nov 2021 14:38:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232182AbhKJOlA (ORCPT ); Wed, 10 Nov 2021 09:41:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232186AbhKJOlA (ORCPT ); Wed, 10 Nov 2021 09:41:00 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A861C061764 for ; Wed, 10 Nov 2021 06:38:12 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id b15so11290779edd.7 for ; Wed, 10 Nov 2021 06:38:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Tbed0ZzCbfH/NFZk+qckJsMKE+1UI6IMMi6vOu2wbcw=; b=AUyFTAw2CMSd20nMAhwtSslhdffGsck6kodMDdsiIErVEEZlb2ehkHwYjGAXZU1oJu HlyowT0bfaiHyZrwvGU4tmyP3hdFX+3HnPbT4txR8WpVDBRUERXcDZfa8D3JbEQ7YsHy WSE6IuzPwWVZcBaaoGBWkj52N6GUhOb6EYS4Vc26o9/ZKbRLYDYPToIxjh78BFgzFOsL GNNh4zJGsDm5DvzRe5ySMzaKu2AgMW3lxBGPrTEPdc96EDurBW4ehAKfDMmf97H7m7fD z9vjhAG5+vm95PCYqnnrQsTAdRLD3mS8LwNlMgm+1TeOLmk/hfNrg5tYC2Q1ASUFOVPY b/1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tbed0ZzCbfH/NFZk+qckJsMKE+1UI6IMMi6vOu2wbcw=; b=WO3pn9no5C3rmS5nqUU9+8sZkIokChOhL3hPCQ4dTio28CiFsO2sEgK+3IXWpLi8Io NpCnPNfEJNFaMtOK1qB4B+Yh8IYCVLJHFKV+4FrMr4Yz0qswLc7sbTZ3JTEx1rHhT+PH 28Z88Wc/yrNc14EdY0d9QU54IDTxVnu6PNQisp84nG0sfS1uVe7i3xV02MsBdZsK6V3g ZbhPwSJS/noVqa3rd0yIrU4a6MtICSRW10EVeEJYzWbdsPc+0DwL65HIkZHWk9SDNZaM VcSVkeec2jeUygG3hojs/rP+CKz+snppXF8WJA5tXJyZPSq9MwKA4fhlMG9EWAWqh+T6 1faw== X-Gm-Message-State: AOAM532BlIxtqMYRw1F7UnkomGB47kwY234+9PtMDMyXXkeNT54uSffo oVPuF7JD7tOtFg9Y2k/JAt3TvTM3LHc= X-Google-Smtp-Source: ABdhPJwae0MWFHYLLcanE5mreNJ41MRfG5BD0AGDnhPkO5GYjaAZoYl5+quwgQpG2hqigfA68kZrlg== X-Received: by 2002:a05:6402:1908:: with SMTP id e8mr57349edz.83.1636555090877; Wed, 10 Nov 2021 06:38:10 -0800 (PST) Received: from crow.. ([95.87.219.163]) by smtp.gmail.com with ESMTPSA id hc10sm11477039ejc.99.2021.11.10.06.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:38:10 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: linux-trace-devel@vger.kernel.org Cc: "Yordan Karadzhov (VMware)" Subject: [PATCH 3/5] kernel-shark: Update the README file Date: Wed, 10 Nov 2021 16:37:45 +0200 Message-Id: <20211110143747.32833-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211110143747.32833-1-y.karadz@gmail.com> References: <20211110143747.32833-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Making sure that the install instructions are adequate for building with the latest versions of the third-party libraries. Signed-off-by: Yordan Karadzhov (VMware) --- README | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/README b/README index 652891c..24d6001 100644 --- a/README +++ b/README @@ -13,7 +13,8 @@ KernelShark has the following external dependencies: 1. In order to install the packages on Ubuntu do the following: sudo apt-get install build-essential git cmake libjson-c-dev -y sudo apt-get install freeglut3-dev libxmu-dev libxi-dev -y - sudo apt-get install fonts-freefont-ttf + sudo apt-get install flex bison -y + sudo apt-get install fonts-freefont-ttf -y sudo apt-get install qtbase5-dev -y 1.1 If you want to be able to generate Doxygen documentation: @@ -21,12 +22,14 @@ KernelShark has the following external dependencies: 2. In order to install the packages on Fedora, as root do the following: - dnf install gcc gcc-c++ git cmake json-c-devel -y - dnf install freeglut-devel redhat-rpm-config -y - dnf install qt5-qtbase-devel -y + sudo dnf install gcc gcc-c++ git cmake json-c-devel -y + sudo dnf install freeglut-devel redhat-rpm-config -y + sudo dnf install flex bison -y + sudo dnf install gnu-free-sans-fonts -y + sudo dnf install qt5-qtbase-devel -y 2.1 If you want to be able to generate Doxygen documentation: - dnf install graphviz doxygen -y + sudo dnf install graphviz doxygen -y 3. In order to install the final dependencies do the following: @@ -43,6 +46,8 @@ KernelShark has the following external dependencies: git clone https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/ cd trace-cmd make + make libs + sudo make install sudo make install_libs Building: From patchwork Wed Nov 10 14:37:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 12612227 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4E05C43219 for ; Wed, 10 Nov 2021 14:38:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8BFDF611AD for ; Wed, 10 Nov 2021 14:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232192AbhKJOlB (ORCPT ); Wed, 10 Nov 2021 09:41:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232186AbhKJOlB (ORCPT ); Wed, 10 Nov 2021 09:41:01 -0500 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52B39C061764 for ; Wed, 10 Nov 2021 06:38:13 -0800 (PST) Received: by mail-ed1-x531.google.com with SMTP id c8so11193590ede.13 for ; Wed, 10 Nov 2021 06:38:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gVl2lGOEbrYtvOxvPaqXjrFeVlmvMF0E1XHgYel1EJM=; b=StckmEvNhPwmp5pClBkzzVVxcK1biazyCtZALvJFe28xVW4TTQ9ZWuQFCW7fkcMLJ8 pgFVMsqYLM6rWd8Fm6DEH5QSEXoV8g04HKszc1mMmNu7i4GgMMD9dLtQJox3rBeqq9z0 2dbiLUcW/dBmf+mvFetdHrNt5MSWrj8a5Y+Dm24eraMSCy6G5lLUhgFZwO22evL1H09j VYUXajK8C0tdktEoRs3QHYwXDP2jrThM/4PGkx+4t8FXya81qdwN7DUyZw+yA/Lt2uxz Vjp1NQ1PRlK73w2xWobKdNRa2ttt+zourF2UudbjRnMRqBUzBX5R44sgWwtuSCPBCAWV bO2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gVl2lGOEbrYtvOxvPaqXjrFeVlmvMF0E1XHgYel1EJM=; b=mICI4ZIf7gEB4UOJlNjoHW6HKL75WjcXukeaYi+YJWjZPYFp3AECqCL/4pP0ryt+Fi kzdQU0emH1Dqpq+EjZuTQX09r+t6CHtG3w9Dc4o3Xg2zW03HkRZfopW43RCOGbm/AeV+ rYYcsErPSgT3msCxT8Tsh0bAfUcQVsiCx6g7RF+ZT9PLIRUgAPxXS9YtKeVAmWESSKrr aVjkECFIf7N8y7r39WI+r2HLnTM+0d4CELH05p1zVSFVMs3R2upl3i1LDzdwNgN9DDHL gk6DttHOugI8sVvr2KpH9JVHseMyerqbDBPXUBs1/dmWcN4EUGblQy/wK/oXmwdh4Qkm 8/+g== X-Gm-Message-State: AOAM531aASHHua0vvkk9SWRiQxWXr7JmG1FPd934a0t2obu7ce4/IUmF 9poaQxMs9WgIJi7Aa33wRL2g7dHnPMY= X-Google-Smtp-Source: ABdhPJwB/eufP/ynEEl9Mpgh6yEixjNoCdN5EPaAx05A6wYC4WpMoq1JL8JCZByd1PXzvk8sNZz+iw== X-Received: by 2002:aa7:c4d3:: with SMTP id p19mr11586edr.333.1636555091659; Wed, 10 Nov 2021 06:38:11 -0800 (PST) Received: from crow.. ([95.87.219.163]) by smtp.gmail.com with ESMTPSA id hc10sm11477039ejc.99.2021.11.10.06.38.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:38:11 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: linux-trace-devel@vger.kernel.org Cc: "Yordan Karadzhov (VMware)" Subject: [PATCH 4/5] kernel-shark: Add 'Requires' to libkshark.pc Date: Wed, 10 Nov 2021 16:37:46 +0200 Message-Id: <20211110143747.32833-4-y.karadz@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211110143747.32833-1-y.karadz@gmail.com> References: <20211110143747.32833-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Adding only the requirements for building 'libkshark'. The requirements for building the GUI are not supposed to be listed here. Signed-off-by: Yordan Karadzhov (VMware) --- CMakeLists.txt | 2 ++ build/libkshark.pc.cmake | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb7b2a1..3723654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,8 @@ if (NOT _POLKIT_INSTALL_PREFIX) endif () +set(LIBTRACECMD_MIN_VERSION 1.0) + set(CMAKE_MODULE_PATH "${KS_DIR}/build") find_package(TraceEvent REQUIRED) find_package(TraceFS REQUIRED) diff --git a/build/libkshark.pc.cmake b/build/libkshark.pc.cmake index ad4ce34..0591cf9 100644 --- a/build/libkshark.pc.cmake +++ b/build/libkshark.pc.cmake @@ -6,5 +6,7 @@ Name: libkshark URL: https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/ Description: Library for accessing ftrace file system Version: @KS_VERSION_STRING@ +Requires: tracecmd >= @LIBTRACECMD_MIN_VERSION@ +Requires: json-c Cflags: -I${includedir} Libs: -L${libdir} -lkshark From patchwork Wed Nov 10 14:37:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 12612231 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54065C433EF for ; Wed, 10 Nov 2021 14:38:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 340796124D for ; Wed, 10 Nov 2021 14:38:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232193AbhKJOlD (ORCPT ); Wed, 10 Nov 2021 09:41:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232186AbhKJOlC (ORCPT ); Wed, 10 Nov 2021 09:41:02 -0500 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF83EC061764 for ; Wed, 10 Nov 2021 06:38:14 -0800 (PST) Received: by mail-ed1-x532.google.com with SMTP id w1so11364038edd.10 for ; Wed, 10 Nov 2021 06:38:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s9gSWyGuItWBGshXoLLpqDKJdEMACqx8O1xsTMATnqY=; b=C9/ysoDAiaknluqgT5rllR3UAJOuijsbzXgH7aONJZEIyWk7Ip2kLHu8eVyMFxis1N wjfYMFDb6zdFoH8izcQBNz6ofcrNw4VhKpY6+JKsHOE3E7wDKjv1ACf35NAmt6Imuftt 1ezWGGJF/UCaE8A5UDffvJXRBos7bGRpYW7Zu7Xw+Jab3LlFof78LpTvAP199UZMXj+U Bc4v425wnsEKnd22gBKagy7RwzN9analm0pfWVBdF99CKPStU/jMkEB5QTtHKRnAw/Lu Bkdo8EeQ2rybXmCFMUTw6K3WeZig0zAun9e78UMbrPTAE97Nn6F2Ud3rtZwz/cGEM8TR EaFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s9gSWyGuItWBGshXoLLpqDKJdEMACqx8O1xsTMATnqY=; b=I2vYGD/3z6yOfqiJnc/aY6UPTQtWNuQXhsNYmvNkFt/vQpPp6wX4QOMlQNyPy3rHPL ImEdKWASTig81b2w5VuF62VMK4c0aDVFpfC2Wly1R3eAf5MgmRHjP2aoitSxyXeneUTX /vnNj6wqOy3EehE3Y+K20AItoKbjeSYnfg19uSXIfrnUCq1zKlP0oGg4tMeccSAr7Sl+ Q4P8Rz3U6DXoDwZJe2gMlNwv3d9F6Lu+U+15EXMyP0CM/zGjiCKA/8MZA8RrK4ttPSB9 SDgHK/CZFYgvcNvmJX2VHChEmkVZ4zZSIuuWo69qEo/EX9IymEu/D1JgV6kYAqpvoiEf ywqw== X-Gm-Message-State: AOAM530HdIsw6DRXXA3A350NvjQD7IlrbV1FaNC6ysUih21ks+vxYVm3 I9FOF/IjOXBUaMg+PNx3gWwwGAqZKwQ= X-Google-Smtp-Source: ABdhPJw2xkNruos5W//w/QcvbNG9gon+pakKpZJEi2buE+09VP/9Dl64dWFk8t658xH+OLbJOmA57w== X-Received: by 2002:a50:e0c9:: with SMTP id j9mr86074edl.336.1636555092353; Wed, 10 Nov 2021 06:38:12 -0800 (PST) Received: from crow.. ([95.87.219.163]) by smtp.gmail.com with ESMTPSA id hc10sm11477039ejc.99.2021.11.10.06.38.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:38:12 -0800 (PST) From: "Yordan Karadzhov (VMware)" To: linux-trace-devel@vger.kernel.org Cc: "Yordan Karadzhov (VMware)" Subject: [PATCH 5/5] kernel-shark: Always run 'ldconfig' after installing libkshark Date: Wed, 10 Nov 2021 16:37:47 +0200 Message-Id: <20211110143747.32833-5-y.karadz@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211110143747.32833-1-y.karadz@gmail.com> References: <20211110143747.32833-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org This way we make sure that the run-time bindings of the linker are properly configured and have the necessary cache to find the library. Signed-off-by: Yordan Karadzhov (VMware) --- src/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f3c4e0a..babb9c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -46,6 +46,11 @@ install(FILES "${KS_DIR}/libkshark.pc" DESTINATION ${PKG_CONGIG_DIR} COMPONENT libkshark-devel) +install(CODE "message(\"-- Executing: ldconfig ${_LIBDIR}\") + execute_process(COMMAND bash \"-c\" \"ldconfig ${_INSTALL_PREFIX}\" + ECHO_ERROR_VARIABLE)" + COMPONENT libkshark-devel) + if (OPENGL_FOUND) message(STATUS "libkshark-plot")