aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYordan Karadzhov <ykaradzhov@vmware.com>2019-03-14 17:10:04 +0200
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2019-03-22 15:14:11 -0400
commit1eb4cd9acda4ca8dff3c485a4153815d8f22edea (patch)
tree6b363682b521fc06987215c9f13f07e6abde224b
parent62bf69bf36c761cefd522b2cf1bbac062ba9d348 (diff)
downloadtrace-cmd-1eb4cd9acda4ca8dff3c485a4153815d8f22edea.tar.gz
kernel-shark: Error message if the opening of the session file fails
Here we add proper handling of the case when the loading of the session description file fails. Link: http://lore.kernel.org/linux-trace-devel/20190314151012.905-5-ykaradzhov@vmware.com Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-rw-r--r--kernel-shark/src/KsMainWindow.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp
index 95326108..0c3b42df 100644
--- a/kernel-shark/src/KsMainWindow.cpp
+++ b/kernel-shark/src/KsMainWindow.cpp
@@ -1004,7 +1004,16 @@ void KsMainWindow::loadSession(const QString &fileName)
return;
}
- _session.importFromFile(fileName);
+ if (!_session.importFromFile(fileName)) {
+ QString text("Unable to open session description file ");
+
+ text.append(fileName);
+ text.append(".\n");
+ _error(text, "loadSessErr1", true, true);
+
+ return;
+ }
+
_session.loadPlugins(kshark_ctx, &_plugins);
QString dataFile(_session.getDataFile(kshark_ctx));