From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org, julia.lawall@inria.fr,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Subject: [PATCH 2/2] kernel-shark: Add command line options for selecting plots to be shown
Date: Fri, 24 Apr 2020 16:25:42 +0300 [thread overview]
Message-ID: <20200424132542.1620-3-y.karadz@gmail.com> (raw)
In-Reply-To: <20200424132542.1620-1-y.karadz@gmail.com>
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) <y.karadz@gmail.com>
Suggested-by: Julia Lawall <julia.lawall@inria.fr>
---
kernel-shark/src/KsUtils.cpp | 24 ++++++++++++++++++++++++
kernel-shark/src/KsUtils.hpp | 2 ++
kernel-shark/src/kernelshark.cpp | 32 +++++++++++++++++++++++++++++---
3 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/kernel-shark/src/KsUtils.cpp b/kernel-shark/src/KsUtils.cpp
index e99509f..4a46014 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<int> parseIdList(QString v_str)
+{
+ QStringList list = v_str.split(" ", QString::SkipEmptyParts);
+ QVector<int> v;
+
+ for (auto item: list) {
+ int i = item.indexOf('-');
+ if (i > 0) {
+ /* This item is an interval. */
+ int from = item.left(i).toInt();
+ int n = item.right(i).toInt() - from + 1;
+ int size = v.size();
+
+ v.resize(size + n);
+ std::iota(v.begin() + size, 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<int> 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..55b5831 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<int> 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,9 @@ int main(int argc, char **argv)
ks.loadDataFile(QString(input_file));
}
+ ks.setCPUPlots(cpuPlots);
+ ks.setTaskPlots(taskPlots);
+
ks.show();
return a.exec();
}
--
2.20.1
next prev parent reply other threads:[~2020-04-24 13:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 13:25 [PATCH 0/2] Command line options for selecting plots Yordan Karadzhov (VMware)
2020-04-24 13:25 ` [PATCH 1/2] kernel-shark: Add methods for selecting the plots to be shown Yordan Karadzhov (VMware)
2020-04-24 13:25 ` Yordan Karadzhov (VMware) [this message]
2020-05-04 19:13 ` [PATCH 2/2] kernel-shark: Add command line options for selecting " Steven Rostedt
2020-05-04 19:17 ` Julia Lawall
2020-05-08 13:11 ` Yordan Karadzhov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200424132542.1620-3-y.karadz@gmail.com \
--to=y.karadz@gmail.com \
--cc=julia.lawall@inria.fr \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).