From: Yordan Karadzhov <ykaradzhov@vmware.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH 2/4] kernel-shark: Set the configuration cache directory via env. variable
Date: Thu, 4 Apr 2019 17:56:01 +0300 [thread overview]
Message-ID: <20190404145603.13592-3-ykaradzhov@vmware.com> (raw)
In-Reply-To: <20190404145603.13592-1-ykaradzhov@vmware.com>
The environment variable ${KS_USER_CONF_DIR} can be used to specify
the directory where the "Last session" configuration file will be
saved.
Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com>
---
kernel-shark/src/KsMainWindow.cpp | 19 +++++++++++++------
kernel-shark/src/KsMainWindow.hpp | 2 ++
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp
index d07a89d..39b06d6 100644
--- a/kernel-shark/src/KsMainWindow.cpp
+++ b/kernel-shark/src/KsMainWindow.cpp
@@ -133,9 +133,8 @@ KsMainWindow::KsMainWindow(QWidget *parent)
KsMainWindow::~KsMainWindow()
{
kshark_context *kshark_ctx(nullptr);
- QString file = _KS_CACHE_DIR;
- file += "/lastsession.json";
+ QString file = lastSessionFile();
_updateSession();
kshark_save_config_file(file.toLocal8Bit().data(),
@@ -368,12 +367,20 @@ void KsMainWindow::_open()
loadDataFile(fileName);
}
-void KsMainWindow::_restoreSession()
+/** Get the description file of the last session. */
+QString KsMainWindow::lastSessionFile()
{
- QString file = _KS_CACHE_DIR;
- file += "/lastsession.json";
+ const char *file = getenv("KS_USER_CONF_DIR");
+
+ if (!file)
+ file = _KS_CACHE_DIR;
+
+ return QString(file) + "/lastsession.json";
+}
- loadSession(file);
+void KsMainWindow::_restoreSession()
+{
+ loadSession(lastSessionFile());
_graph.updateGeom();
}
diff --git a/kernel-shark/src/KsMainWindow.hpp b/kernel-shark/src/KsMainWindow.hpp
index 78cd442..1ecf2d8 100644
--- a/kernel-shark/src/KsMainWindow.hpp
+++ b/kernel-shark/src/KsMainWindow.hpp
@@ -37,6 +37,8 @@ public:
void loadSession(const QString &fileName);
+ QString lastSessionFile();
+
/**
* @brief
*
--
2.19.1
next prev parent reply other threads:[~2019-04-04 14:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 14:55 [PATCH 0/4] Various modifications and fixes toward KS 1.0 Yordan Karadzhov
2019-04-04 14:56 ` [PATCH 1/4] kernel-shark: Configuration information in ${HOME}/.cache/kernelshark Yordan Karadzhov
2019-04-08 15:01 ` Slavomir Kaslev
2019-04-08 15:13 ` Steven Rostedt
2019-04-09 12:23 ` Yordan Karadzhov (VMware)
2019-04-09 13:11 ` Slavomir Kaslev
2019-04-09 13:23 ` Steven Rostedt
2019-04-09 13:33 ` Yordan Karadzhov
2019-04-09 14:59 ` Slavomir Kaslev
2019-04-09 15:11 ` Steven Rostedt
2019-04-09 15:44 ` Slavomir Kaslev
2019-04-09 17:02 ` Steven Rostedt
2019-04-15 11:05 ` Yordan Karadzhov (VMware)
2019-04-15 13:11 ` Slavomir Kaslev
2019-04-15 13:58 ` Yordan Karadzhov (VMware)
2019-04-15 11:16 ` Yordan Karadzhov (VMware)
2019-04-15 20:04 ` Steven Rostedt
2019-04-04 14:56 ` Yordan Karadzhov [this message]
2019-04-04 14:56 ` [PATCH 3/4] kernel-shark: Load Last Session from command line Yordan Karadzhov
2019-04-04 14:56 ` [PATCH 4/4] kernel-shark: Configuration file directory to be created by the executable Yordan Karadzhov
2019-04-08 15:03 ` Slavomir Kaslev
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=20190404145603.13592-3-ykaradzhov@vmware.com \
--to=ykaradzhov@vmware.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).