From: Steven Rostedt <rostedt@goodmis.org>
To: Yordan Karadzhov <ykaradzhov@vmware.com>
Cc: "linux-trace-devel@vger.kernel.org" <linux-trace-devel@vger.kernel.org>
Subject: Re: [PATCH 1/5] kernel-shark-qt: Avoid spurious searches
Date: Thu, 13 Dec 2018 22:47:39 -0500 [thread overview]
Message-ID: <20181213224739.0510e951@vmware.local.home> (raw)
In-Reply-To: <20181212165826.8218-2-ykaradzhov@vmware.com>
On Wed, 12 Dec 2018 16:58:44 +0000
Yordan Karadzhov <ykaradzhov@vmware.com> wrote:
> Do not search if the text field of search panel is empty.
> Most probably this is an accidental key press or mouse click.
>
> The text field gets locked only during the actual searching.
>
> Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com>
> ---
> kernel-shark-qt/src/KsTraceViewer.cpp | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/kernel-shark-qt/src/KsTraceViewer.cpp b/kernel-shark-qt/src/KsTraceViewer.cpp
> index a308ea0..599b687 100644
> --- a/kernel-shark-qt/src/KsTraceViewer.cpp
> +++ b/kernel-shark-qt/src/KsTraceViewer.cpp
> @@ -308,8 +308,6 @@ static bool matchCond(const QString &searchText, const QString &itemText)
>
> void KsTraceViewer::_search()
> {
> - /* Disable the user input until the search is done. */
> - _searchLineEdit.setReadOnly(true);
Hmm, can any races happen by setting the search line read only after
the empty checks?
Also, I found a bug. Try this on a large data file. It doesn't matter
what data file it is.
With the Search: at its start up defaults (with Column = "#"), type
"aaa" in the search window and then hit enter. While the search is
going on, hit the "Next" button. See what happens.
-- Steve
> if (!_searchDone) {
> int xColumn, xSelect;
> QString xText;
> @@ -319,7 +317,19 @@ void KsTraceViewer::_search()
> * have been modified since the last time we searched.
> */
> _matchList.clear();
> +
> xText = _searchLineEdit.text();
> + if (xText.isEmpty()) {
> + /*
> + * No text is provided by the user. Most probably this
> + * is an accidental key press.
> + */
> + return;
> + }
> +
> + /* Disable the user input until the search is done. */
> + _searchLineEdit.setReadOnly(true);
> +
> xColumn = _columnComboBox.currentIndex();
> xSelect = _selectComboBox.currentIndex();
>
> @@ -346,6 +356,9 @@ void KsTraceViewer::_search()
> if (_graphFollows)
> emit select(*_it); // Send a signal to the Graph widget.
> }
> +
> + /* Enable the user input. */
> + _searchLineEdit.setReadOnly(false);
> } else {
> /*
> * If the search is done, pressing "Enter" is equivalent
> @@ -353,9 +366,6 @@ void KsTraceViewer::_search()
> */
> this->_next();
> }
> -
> - /* Enable the user input. */
> - _searchLineEdit.setReadOnly(false);
> }
>
> void KsTraceViewer::_next()
next prev parent reply other threads:[~2018-12-14 3:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 16:58 [PATCH 0/5] More modifications toward KS 1.0 Yordan Karadzhov
2018-12-12 16:58 ` [PATCH 1/5] kernel-shark-qt: Avoid spurious searches Yordan Karadzhov
2018-12-14 3:47 ` Steven Rostedt [this message]
2018-12-14 12:02 ` Yordan Karadzhov (VMware)
2018-12-12 16:58 ` [PATCH 2/5] kernel-shark-qt: Create "Apply filter XX" checkboxes in KsUtils Yordan Karadzhov
2018-12-12 16:58 ` [PATCH 3/5] kernel-shark-qt: Improuve the KsQuickContextMenu Yordan Karadzhov
2018-12-12 16:58 ` [PATCH 4/5] kernel-shark-qt: Update the documentation link Yordan Karadzhov
2018-12-12 16:58 ` [PATCH 5/5] kernel-shark-qt: Version 1.0.0 Yordan Karadzhov
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=20181213224739.0510e951@vmware.local.home \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=ykaradzhov@vmware.com \
/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).