From patchwork Mon Apr 27 15:41:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11512459 X-Patchwork-Delegate: rostedt@goodmis.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 389291667 for ; Mon, 27 Apr 2020 15:42:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22DFE20738 for ; Mon, 27 Apr 2020 15:42:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bt1CWCRK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727077AbgD0PmR (ORCPT ); Mon, 27 Apr 2020 11:42:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728032AbgD0PmR (ORCPT ); Mon, 27 Apr 2020 11:42:17 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8406C03C1A7 for ; Mon, 27 Apr 2020 08:42:16 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id g4so18108020ljl.2 for ; Mon, 27 Apr 2020 08:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ABPby8OBmB71raeP0X30P+jP4GhOfo80R/Dch90ugcI=; b=Bt1CWCRKyhDytKIKdwX/pwf0MU5bSK9mqnk/UItxmJxrMeWfvEc/dcrqJoirBD4gEj bruQLAVyd8L3jCMl/1aYx7pfB3sHtYbJOYlJJrDDbW2EXXffrqIUgaoBU+i3B+7t4box cmqA5iY5cGv/Vm/aiZm8llOjPmcxFWOX/0C0hI3zSCuAvk2eLwnkRfbqDdppuDkF1oQW GKgwBAhNgK2HMJKId81F2QVFFWZVCr1k+Gq6zwsSuFcTlXKHFwFPPZ7UM5eVthF2u1/3 VkGzDjXlqY9ZkW/E78+2++D7g2m3B8YQlllrDc/NT5cuIoPBl4M+a9W44srdbHmlCwbE MqpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ABPby8OBmB71raeP0X30P+jP4GhOfo80R/Dch90ugcI=; b=CfeTUVEqzFvX/qLHn6NkTHmBQ6Hq/LfxsjCkJWSjXHk74LcUm5ZihJ0z7Ww8hm779v gnY4H1wgj9yMykyzeH/KW4RoQV0Aa0FomG30apneQsOhH0AKT0k3vG1MSKV6SKKjH8ev B9+PLdUIHp4yTNMaORteyxwvn/39ChkkA0M+YOqRRJnuRvHHqX3KzxlYqnNSOLXZUilJ QJF4ZSCWRerKtXhm3HARGTdrdk17rZzvaAJClKx9hKY/7hrE3lhRfmsuLDJ4Sdk6u32E AcZ+m5hJXjfIdJ3yFZ3sfjH169x31o8JzM3YBBvo/LevWYIqhMfKZzq2aCsTMC1FwfwW amMQ== X-Gm-Message-State: AGi0PuYT8pCfjnJ34ftc3fMbiiK1Geln55d+9Jx7djTLT6bdAySh6UdB y4QsFjdxbR4ZTllWgROfEi4Kgs5FY4k= X-Google-Smtp-Source: APiQypK9c/lUXn+Awc/e1W+obWRiFn4hOy68idiVzW8QK6AkcsOaibAJ//sFSjGLchwynjvZp/XhLA== X-Received: by 2002:a2e:8087:: with SMTP id i7mr13502265ljg.99.1588002135304; Mon, 27 Apr 2020 08:42:15 -0700 (PDT) Received: from localhost.localdomain ([84.40.73.119]) by smtp.gmail.com with ESMTPSA id s8sm11515524lfd.61.2020.04.27.08.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 08:42:14 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, julia.lawall@inria.fr, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 1/3] kernel-shark: Add methods for selecting the plots to be shown Date: Mon, 27 Apr 2020 18:41:50 +0300 Message-Id: <20200427154152.20592-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427154152.20592-1-y.karadz@gmail.com> References: <20200427154152.20592-1-y.karadz@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The methods are added to the public interface of the KsMainWindow class and can be used to pre-select the CPU and Task plots to be shown, before opening the GUI. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsMainWindow.cpp | 39 +++++++++++++++++++++++++++++++ kernel-shark/src/KsMainWindow.hpp | 4 ++++ 2 files changed, 43 insertions(+) diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index a5a399c..333e14b 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp @@ -172,6 +172,45 @@ KsMainWindow::~KsMainWindow() kshark_free(kshark_ctx); } +/** Set the list ot CPU cores to be plotted. */ +void KsMainWindow::setCPUPlots(QVector cpus) +{ + int nCPUs = tep_get_cpus(_data.tep()); + auto lamCPUCheck = [=] (int cpu) { + if (cpu >= nCPUs) { + qWarning() << "Warning: No CPU" << cpu << "found in the data."; + return true; + } + + return false; + }; + + cpus.erase(std::remove_if(cpus.begin(), cpus.end(), lamCPUCheck), + cpus.end()); + + _graph.cpuReDraw(cpus); +} + +/** Set the list ot tasks (pids) to be plotted. */ +void KsMainWindow::setTaskPlots(QVector pids) +{ + QVector allPids = KsUtils::getPidList(); + auto lamPidCheck = [=] (int pid) { + int i = allPids.indexOf(pid); + if (i < 0) { + qWarning() << "Warning: No Pid" << pid << "found in the data."; + return true; + } + + return false; + }; + + pids.erase(std::remove_if(pids.begin(), pids.end(), lamPidCheck), + pids.end()); + + _graph.taskReDraw(pids); +} + /** * Reimplemented event handler used to update the geometry of the window on * resize events. diff --git a/kernel-shark/src/KsMainWindow.hpp b/kernel-shark/src/KsMainWindow.hpp index eef4f96..774e1c9 100644 --- a/kernel-shark/src/KsMainWindow.hpp +++ b/kernel-shark/src/KsMainWindow.hpp @@ -61,6 +61,10 @@ public: _plugins.unregisterPlugin(plugin); } + void setCPUPlots(QVector cpus); + + void setTaskPlots(QVector pids); + void resizeEvent(QResizeEvent* event); /** Set the Full Screen mode. */ From patchwork Mon Apr 27 15:41:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11512461 X-Patchwork-Delegate: rostedt@goodmis.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D743514DD for ; Mon, 27 Apr 2020 15:42:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C05D1206D4 for ; Mon, 27 Apr 2020 15:42:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LhB6njL9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728172AbgD0PmU (ORCPT ); Mon, 27 Apr 2020 11:42:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728032AbgD0PmU (ORCPT ); Mon, 27 Apr 2020 11:42:20 -0400 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2601C0610D5 for ; Mon, 27 Apr 2020 08:42:19 -0700 (PDT) Received: by mail-lj1-x22e.google.com with SMTP id l19so18075342lje.10 for ; Mon, 27 Apr 2020 08:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4C24MlcI+zyJupm/LhxK9ybhVXtpl+GwOndMUrVxfbA=; b=LhB6njL9hxz7KHBvB5kvDt7rM2QYQhi8FiKLZsL5o0R9d8qIRHmEDoVXyqM476osUV unsdi588O9x5WFy+r18wLl2tHql99M6WwIPYbK7/Mg50abjcVsmhcoRHOe+DN73ePfLt VIZ4ZjCwXT9C+OcJtuJCDb8r0ZeeLqSpXUE+IIxlIcJ4l7hAH8E8UpddcyjdVi+kuttR J0PSUOlgKDubkW8ipCFNi8xHTcsedGCmaA2XPhQQ+ff9WfTVC1KSTsyR1For5CJD8tMC UNAF2yqG1gP4YjkNf96adgAn99Ou9SWG7MRwRVhSg7xYw6YTBnttgBvfLz0lVAK54csY KILw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4C24MlcI+zyJupm/LhxK9ybhVXtpl+GwOndMUrVxfbA=; b=Cdd9ESE+QZNV8Zj9JRAFXhimOxL5FCFZk1oc3Jy+NH84WcprQCcC7yq29db/aV9RtM M1I39SzQ/VjJq0X3JxM6uYpv5odHIPMQBHdcWZy3KtlOQgNxElBtvYBEOTx9PPbZ1CyH sMp46ROlXssv94roJcWutVjP49TDJCM3xnBT3TUohM/6xLX9VXgOExlJYKhCccMMtVNy 6vI/2tQT9qlyhgBSxrHH3OKDwmCxKzkAop4+yCU8AsuL1F+qoeJNwWbr8EzSTeJbi5s4 hMMa3XkTaVw3Hw8LirGrm5ka6Zozjm/HQE6Ph9r6bHWgfBfEuE2EQZAYkbWIdAaDHpJu XR5w== X-Gm-Message-State: AGi0PubPMKpGzVmeK51JaST4NMxIZ40EcGKjShARAsgAASZqIU9SwFeY KsXlwLpr6q1KiQeBWhaTmio= X-Google-Smtp-Source: APiQypLezAdvNjkAf3d0tzyYHt4Ww8nnWoOxbv7EHYCfn0wdCxFvvmIUGPgvZpaMR66NxRW/+DIOvg== X-Received: by 2002:a2e:9ada:: with SMTP id p26mr15029806ljj.14.1588002138392; Mon, 27 Apr 2020 08:42:18 -0700 (PDT) Received: from localhost.localdomain ([84.40.73.119]) by smtp.gmail.com with ESMTPSA id s8sm11515524lfd.61.2020.04.27.08.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 08:42:17 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, julia.lawall@inria.fr, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 2/3] kernel-shark: Add command line options for selecting plots to be shown Date: Mon, 27 Apr 2020 18:41:51 +0300 Message-Id: <20200427154152.20592-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427154152.20592-1-y.karadz@gmail.com> References: <20200427154152.20592-1-y.karadz@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Example: kernelshark -i mytrace.dat --cpu '1 4-7' --pid 11 This will show CPUs: 1, 4, 5, 6, 7 and task(PID): 11. Signed-off-by: Yordan Karadzhov (VMware) Suggested-by: Julia Lawall --- kernel-shark/src/KsUtils.cpp | 24 ++++++++++++++++++++++ kernel-shark/src/KsUtils.hpp | 2 ++ kernel-shark/src/kernelshark.cpp | 34 +++++++++++++++++++++++++++++--- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/kernel-shark/src/KsUtils.cpp b/kernel-shark/src/KsUtils.cpp index e99509f..3997d97 100644 --- a/kernel-shark/src/KsUtils.cpp +++ b/kernel-shark/src/KsUtils.cpp @@ -298,6 +298,30 @@ QStringList splitArguments(QString cmd) return argv; } +/** Parse a string containing Ids. The string can be of the form "1 4-7 9". */ +QVector parseIdList(QString v_str) +{ + QStringList list = v_str.split(" ", QString::SkipEmptyParts); + QVector v; + + for (auto item: list) { + int i = item.indexOf('-'); + if (i > 0) { + /* This item is an interval. */ + int to = item.right(item.size() - i - 1).toInt(); + int from = item.left(i).toInt(); + int s = v.size(); + + v.resize(s + to - from + 1); + std::iota(v.begin() + s, v.end(), from); + } else { + v.append(item.toInt()); + } + } + + return v; +} + }; // KsUtils /** A stream operator for converting QColor into KsPlot::Color. */ diff --git a/kernel-shark/src/KsUtils.hpp b/kernel-shark/src/KsUtils.hpp index db1bf5e..2efc01c 100644 --- a/kernel-shark/src/KsUtils.hpp +++ b/kernel-shark/src/KsUtils.hpp @@ -132,6 +132,8 @@ QString getSaveFile(QWidget *parent, QStringList splitArguments(QString cmd); +QVector parseIdList(QString v_str); + }; // KsUtils /** Identifier of the Dual Marker active state. */ diff --git a/kernel-shark/src/kernelshark.cpp b/kernel-shark/src/kernelshark.cpp index 1ec6678..0978590 100644 --- a/kernel-shark/src/kernelshark.cpp +++ b/kernel-shark/src/kernelshark.cpp @@ -29,20 +29,43 @@ void usage(const char *prog) printf(" -u unregister plugin, use plugin name or absolute path\n"); printf(" -s import a session\n"); printf(" -l import the last session\n"); + puts(" --cpu show plots for CPU cores, default is \"show all\""); + puts(" --pid show plots for tasks, default is \"do not show\""); + puts("\n example:"); + puts(" kernelshark -i mytrace.dat --cpu \'1 4-7\' --pid 11 -p path/to/my/plugin/myplugin.so\n"); } +#define KS_LONG_OPTS 0 +static option longOptions[] = { + {"help", no_argument, nullptr, 'h'}, + {"pid", required_argument, nullptr, KS_LONG_OPTS}, + {"cpu", required_argument, nullptr, KS_LONG_OPTS}, + {nullptr, 0, nullptr, 0} +}; + int main(int argc, char **argv) { QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication a(argc, argv); + QVector cpuPlots, taskPlots; + bool fromSession = false; + int optionIndex = 0; KsMainWindow ks; - int c; - bool fromSession = false; - while ((c = getopt(argc, argv, "hvi:p:u:s:l")) != -1) { + while ((c = getopt_long(argc, argv, "hvi:p:u:s:l", + longOptions, + &optionIndex)) != -1) { switch(c) { + case KS_LONG_OPTS: + if (strcmp(longOptions[optionIndex].name, "cpu") == 0) + cpuPlots = KsUtils::parseIdList(QString(optarg)); + else if (strcmp(longOptions[optionIndex].name, "pid") == 0) + taskPlots = KsUtils::parseIdList(QString(optarg)); + + break; + case 'h': usage(argv[0]); return 0; @@ -95,6 +118,11 @@ int main(int argc, char **argv) ks.loadDataFile(QString(input_file)); } + if (cpuPlots.count() || taskPlots.count()) { + ks.setCPUPlots(cpuPlots); + ks.setTaskPlots(taskPlots); + } + ks.show(); return a.exec(); } From patchwork Mon Apr 27 15:41:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11512463 X-Patchwork-Delegate: rostedt@goodmis.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9EE3314DD for ; Mon, 27 Apr 2020 15:42:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 877E6206BF for ; Mon, 27 Apr 2020 15:42:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V2cipviU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728032AbgD0PmX (ORCPT ); Mon, 27 Apr 2020 11:42:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727073AbgD0PmX (ORCPT ); Mon, 27 Apr 2020 11:42:23 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF79EC0610D5 for ; Mon, 27 Apr 2020 08:42:22 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id j3so18043342ljg.8 for ; Mon, 27 Apr 2020 08:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hrnnB6MN0NTDjJnvUCSUU9EAtiOKZnt8mbbgqwsDoYQ=; b=V2cipviU4cyqxz3WP1TK6r6wZ3R10PBJIwym8DHgbpohIbsQ9RLg0nogtAqVVteu6a 3VhGU1Cflx7getZ1/hvsFuqQB7pb62kZCsNqN9dQe2RVGmZwCTF3cFswzx4vDw7GYQcM pHgcvASZYdP1cXcyZ+QLgoJyMWc0SEb2risbfMAS0+vOEoS1js66ojs63rcRBwe7jv13 iv2//VcF71Dt/xrDer+9NnjkKGZW4zW3qUXttA9FS/jCLt0KrzgjB/01q2KDZNq2cqsk M648CAdZLPI5h9jztnju+kpYKmWehaAp8epdX75mVwaj7xyeWL3OfYLTf2PuyXCk2qiU bs8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hrnnB6MN0NTDjJnvUCSUU9EAtiOKZnt8mbbgqwsDoYQ=; b=q8K+8+A5ctDd7GpQD+eeDqCo0HAIOt8c8p1Xe9uHCW4AflAhWgHeROMJ/TlwgWiBeG BKlk9yRjXWF9Bmbd+C4XtwsZSfHOzkknjDt1impbdRRCjgP1tFHZs0pnOp/PqUBEWaeo J3pagS/Z4LLqvEnUhGVED2EOp7ur3JRZxupvVgltC+TzkK0RicEvRrrHYO3laxttki3f ohB0YryCNQVP4R4RQ86t302fzuv/m/2gXCL3Ncz0ct+V9FcCETbHl1gLFgtM6Lhhbi0c 1bzAz61HFKEWF8hRfma8WmJRvYTzcqoMoR9wnSdlfS8p0oAI0VziTmIszqF90p1JcugQ htUg== X-Gm-Message-State: AGi0PuYN64TLBdt0S34vTdF/1XESm9uRCdrKkNWrF2pj/OOTsbFXtCpw SEbg7loJ5Qz6TYqueW7bhig= X-Google-Smtp-Source: APiQypLFdiwhztwneomR35LhTeq0GkXKfT0O55wn3UoXfBWTKw3AIjjtwhBIO6wEf5r7fiVdHFlSoA== X-Received: by 2002:a05:651c:319:: with SMTP id a25mr13613780ljp.209.1588002141060; Mon, 27 Apr 2020 08:42:21 -0700 (PDT) Received: from localhost.localdomain ([84.40.73.119]) by smtp.gmail.com with ESMTPSA id s8sm11515524lfd.61.2020.04.27.08.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 08:42:20 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, julia.lawall@inria.fr, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 3/3] kernel-shark: Set a maximum number of plots to be shown by default Date: Mon, 27 Apr 2020 18:41:52 +0300 Message-Id: <20200427154152.20592-4-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200427154152.20592-1-y.karadz@gmail.com> References: <20200427154152.20592-1-y.karadz@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Set a maximum number of CPU plots to be shown by default. No more than 16 CPU plots will be shown if no command line options, per-selecting the plots, are provided. This will be useful when opening trace file containing hundreds of CPU cores. Signed-off-by: Yordan Karadzhov (VMware) Suggested-by: Julia Lawall --- kernel-shark/src/KsGLWidget.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/kernel-shark/src/KsGLWidget.cpp b/kernel-shark/src/KsGLWidget.cpp index e930006..78ded33 100644 --- a/kernel-shark/src/KsGLWidget.cpp +++ b/kernel-shark/src/KsGLWidget.cpp @@ -340,6 +340,11 @@ void KsGLWidget::keyReleaseEvent(QKeyEvent *event) return; } +/** + * The maximum number of CPU plots to be shown by default when the GUI starts. + */ +#define KS_MAX_START_PLOTS 16 + /** * @brief Load and show trace data. * @@ -358,7 +363,6 @@ void KsGLWidget::loadData(KsDataStore *data) * One bin will correspond to one pixel. */ nBins = width() - _hMargin * 2; - nCPUs = tep_get_cpus(_data->tep()); _model.reset(); @@ -368,8 +372,13 @@ void KsGLWidget::loadData(KsDataStore *data) ksmodel_set_bining(_model.histo(), nBins, tMin, tMax); _model.fill(_data->rows(), _data->size()); - /* Make a default CPU list. All CPUs will be plotted. */ + /* Make a default CPU list. All CPUs (or the first N_max) will be plotted. */ _cpuList = {}; + + nCPUs = tep_get_cpus(_data->tep()); + if (nCPUs > KS_MAX_START_PLOTS) + nCPUs = KS_MAX_START_PLOTS; + for (int i = 0; i < nCPUs; ++i) _cpuList.append(i);