From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>
Subject: [PATCH 3/5] kernel-shark: Add two helper methods to KsUtils
Date: Thu, 19 Mar 2020 16:10:29 +0200 [thread overview]
Message-ID: <20200319141031.3774-4-y.karadz@gmail.com> (raw)
In-Reply-To: <20200319141031.3774-1-y.karadz@gmail.com>
The methods can be used to easily retrieve a QVector<int> containing
all CPU or Event IDs. We will later use these method in the GUI
(following patch).
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark/src/KsCaptureDialog.cpp | 6 ++---
kernel-shark/src/KsUtils.cpp | 38 ++++++++++++++++++++++++++++
kernel-shark/src/KsUtils.hpp | 4 +++
3 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp
index 69b9944..d6f8014 100644
--- a/kernel-shark/src/KsCaptureDialog.cpp
+++ b/kernel-shark/src/KsCaptureDialog.cpp
@@ -230,7 +230,7 @@ void KsCaptureControl::_importSettings()
kshark_config_doc *conf, *jevents, *temp;
QVector<bool> v(nEvts, false);
tracecmd_filter_id *eventHash;
- tep_event **events;
+ QVector<int> eventIds;
QString fileName;
auto lamImportError = [this] () {
@@ -238,7 +238,7 @@ void KsCaptureControl::_importSettings()
};
/** Get all available events. */
- events = tep_list_events(_localTEP, TEP_EVENT_SORT_SYSTEM);
+ eventIds = KsUtils::getEventIdList(TEP_EVENT_SORT_SYSTEM);
/* Get the configuration document. */
fileName = KsUtils::getFile(this, "Import from Filter",
@@ -277,7 +277,7 @@ void KsCaptureControl::_importSettings()
}
for (int i = 0; i < nEvts; ++i) {
- if (tracecmd_filter_id_find(eventHash, events[i]->id))
+ if (tracecmd_filter_id_find(eventHash, eventIds[i]))
v[i] = true;
}
diff --git a/kernel-shark/src/KsUtils.cpp b/kernel-shark/src/KsUtils.cpp
index e99509f..77d0c7c 100644
--- a/kernel-shark/src/KsUtils.cpp
+++ b/kernel-shark/src/KsUtils.cpp
@@ -15,6 +15,22 @@
namespace KsUtils {
+/** @brief Get a sorted vector of CPU Ids. */
+QVector<int> getCPUList()
+{
+ kshark_context *kshark_ctx(nullptr);
+ int nCPUs;
+
+ if (!kshark_instance(&kshark_ctx))
+ return {};
+
+ nCPUs = tep_get_cpus(kshark_ctx->pevent);
+ QVector<int> allCPUs = QVector<int>(nCPUs);
+ std::iota(allCPUs.begin(), allCPUs.end(), 0);
+
+ return allCPUs;
+}
+
/** @brief Get a sorted vector of Task's Pids. */
QVector<int> getPidList()
{
@@ -37,6 +53,28 @@ QVector<int> getPidList()
return pids;
}
+/**
+ * @brief Get a sorted vector of Event Ids.
+ */
+QVector<int> getEventIdList(tep_event_sort_type sortType)
+{
+ kshark_context *kshark_ctx(nullptr);
+ tep_event **events;
+ int nEvts;
+
+ if (!kshark_instance(&kshark_ctx))
+ return {};
+
+ nEvts = tep_get_events_count(kshark_ctx->pevent);
+ events = tep_list_events(kshark_ctx->pevent, sortType);
+
+ QVector<int> allEvts(nEvts);
+ for (int i = 0; i < nEvts; ++i)
+ allEvts[i] = events[i]->id;
+
+ return allEvts;
+}
+
/** @brief Get a sorted vector of Id values of a filter. */
QVector<int> getFilterIds(tracecmd_filter_id *filter)
{
diff --git a/kernel-shark/src/KsUtils.hpp b/kernel-shark/src/KsUtils.hpp
index db1bf5e..f44139b 100644
--- a/kernel-shark/src/KsUtils.hpp
+++ b/kernel-shark/src/KsUtils.hpp
@@ -82,8 +82,12 @@ std::chrono::high_resolution_clock::now() - t0).count()
namespace KsUtils {
+QVector<int> getCPUList();
+
QVector<int> getPidList();
+QVector<int> getEventIdList(tep_event_sort_type sortType=TEP_EVENT_SORT_ID);
+
QVector<int> getFilterIds(tracecmd_filter_id *filter);
/** @brief Geat the list of plugins. */
--
2.20.1
next prev parent reply other threads:[~2020-03-19 14:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 14:10 [PATCH 0/5] kernel-shark: Optimize the logic of the filtering menus Yordan Karadzhov (VMware)
2020-03-19 14:10 ` [PATCH 1/5] kernel-shark: Add method for checking if a given ID filter is set Yordan Karadzhov (VMware)
2020-03-19 14:10 ` [PATCH 2/5] kernel-shark: Fix bug in bool kshark_export_all_cpu_filters() Yordan Karadzhov (VMware)
2020-03-19 14:10 ` Yordan Karadzhov (VMware) [this message]
2020-03-19 14:10 ` [PATCH 4/5] kernel-shark: Remove unused methods from KsMainWindow class Yordan Karadzhov (VMware)
2020-03-19 14:10 ` [PATCH 5/5] kernel-shark: Optimize the logic of the filtering menus 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=20200319141031.3774-4-y.karadz@gmail.com \
--to=y.karadz@gmail.com \
--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).