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 4/8] kernel-shark: Don't try to open data file if recording failed
Date: Tue, 9 Jul 2019 18:56:46 +0300 [thread overview]
Message-ID: <20190709155650.2345-5-y.karadz@gmail.com> (raw)
In-Reply-To: <20190709155650.2345-1-y.karadz@gmail.com>
In the case when the recording process failed, the Capture dialog should
not send a signal to the KernelShark GUI to open a new tracing data file.
Suggested-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
---
kernel-shark/src/KsCaptureDialog.cpp | 10 +++++++++-
kernel-shark/src/KsCaptureDialog.hpp | 2 ++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp
index 7da6c08..c877094 100644
--- a/kernel-shark/src/KsCaptureDialog.cpp
+++ b/kernel-shark/src/KsCaptureDialog.cpp
@@ -314,6 +314,7 @@ KsCaptureMonitor::KsCaptureMonitor(QWidget *parent)
: QWidget(parent),
_mergedChannels(false),
_argsModified(false),
+ _captureStatus(false),
_panel(this),
_name("Output display", this),
_space("max size ", this),
@@ -448,6 +449,9 @@ void KsCaptureMonitor::_captureFinished(int exit, QProcess::ExitStatus status)
_consolOutput.appendPlainText(errMessage);
QCoreApplication::processEvents();
+ _captureStatus = false;
+ } else {
+ _captureStatus = true;
}
}
@@ -531,8 +535,12 @@ void KsCaptureDialog::_setChannelMode(int state)
void KsCaptureDialog::_sendOpenReq(const QString &fileName)
{
- QLocalSocket *socket = new QLocalSocket(this);
+ QLocalSocket *socket;
+
+ if (!_captureMon._captureStatus)
+ return;
+ socket = new QLocalSocket(this);
socket->connectToServer("KSCapture", QIODevice::WriteOnly);
if (socket->waitForConnected()) {
QByteArray block;
diff --git a/kernel-shark/src/KsCaptureDialog.hpp b/kernel-shark/src/KsCaptureDialog.hpp
index 2265704..b168a2b 100644
--- a/kernel-shark/src/KsCaptureDialog.hpp
+++ b/kernel-shark/src/KsCaptureDialog.hpp
@@ -119,6 +119,8 @@ public:
*/
bool _argsModified;
+ bool _captureStatus;
+
private:
QVBoxLayout _layout;
--
2.20.1
next prev parent reply other threads:[~2019-07-09 15:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-09 15:56 [PATCH 0/8]Fixes needed befor KS 1.0 Yordan Karadzhov (VMware)
2019-07-09 15:56 ` [PATCH 1/8] kernel-shark: Don't free the string field of KS_CONFIG_STRING document Yordan Karadzhov (VMware)
2019-07-09 15:56 ` [PATCH 2/8] kernel-shark: Add method for getting all selected events Yordan Karadzhov (VMware)
2019-07-09 15:56 ` [PATCH 3/8] kernel-shark: Optimize the command line options used by the capture dialog Yordan Karadzhov (VMware)
2019-07-09 15:56 ` Yordan Karadzhov (VMware) [this message]
2019-07-09 15:56 ` [PATCH 5/8] kernel-shark: Remove a duplicate error message Yordan Karadzhov (VMware)
2019-07-09 15:56 ` [PATCH 6/8] kernel-shark: remove the "make install" suggestion for capture errors Yordan Karadzhov (VMware)
2019-07-10 1:36 ` Steven Rostedt
2019-07-09 15:56 ` [PATCH 7/8] kernel-shark: Disconnect "capture errors" before closing KernelShark GUI Yordan Karadzhov (VMware)
2019-07-09 15:56 ` [PATCH 8/8] kernel-shark: Less scary error message from Capture dialog 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=20190709155650.2345-5-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).