diff options
| author | Yordan Karadzhov <ykaradzhov@vmware.com> | 2019-02-12 19:04:00 +0200 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-02-13 09:40:40 -0500 |
| commit | 3d38628097c57d199935c86dd06ceb9b830c4f4d (patch) | |
| tree | 94d147a4e075df78e842d387cea16b20a5365f00 | |
| parent | d87eb2e4da6d7530bf395ea714baf89e00d2d63a (diff) | |
| download | trace-cmd-3d38628097c57d199935c86dd06ceb9b830c4f4d.tar.gz | |
kernel-shark: Define KS_NO_ROW_SELECTED as a negative row index (-1)
Currently the model of the table treats any negative value of the Passive
Marker index as "No Row is Selected". In multiple places in the code the
value of "-1" is used in order to deselecting the marker. Defining a
dedicated constant (KS_NO_ROW_SELECTED), to be used for deselecting the
Passive Marker will make the code more readable and robust.
Link: http://lore.kernel.org/linux-trace-devel/20190212170402.10104-4-ykaradzhov@vmware.com
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202327
Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | kernel-shark/src/KsModels.cpp | 8 | ||||
| -rw-r--r-- | kernel-shark/src/KsModels.hpp | 3 | ||||
| -rw-r--r-- | kernel-shark/src/KsTraceViewer.cpp | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/kernel-shark/src/KsModels.cpp b/kernel-shark/src/KsModels.cpp index 1b681430..b89fee81 100644 --- a/kernel-shark/src/KsModels.cpp +++ b/kernel-shark/src/KsModels.cpp @@ -199,8 +199,8 @@ KsViewModel::KsViewModel(QObject *parent) _nRows(0), _header({"#", "CPU", "Time Stamp", "Task", "PID", "Latency", "Event", "Info"}), - _markA(-1), - _markB(-1) + _markA(KS_NO_ROW_SELECTED), + _markB(KS_NO_ROW_SELECTED) {} /** @@ -311,10 +311,10 @@ void KsViewModel::selectRow(DualMarkerState state, int row) { if (state == DualMarkerState::A) { _markA = row; - _markB = -1; + _markB = KS_NO_ROW_SELECTED; } else { _markB = row; - _markA = -1; + _markA = KS_NO_ROW_SELECTED; } } diff --git a/kernel-shark/src/KsModels.hpp b/kernel-shark/src/KsModels.hpp index 808c5748..3faaf4a2 100644 --- a/kernel-shark/src/KsModels.hpp +++ b/kernel-shark/src/KsModels.hpp @@ -28,6 +28,9 @@ #include "libkshark-model.h" #include "KsSearchFSM.hpp" +/** A negative row index, to be used for deselecting the Passive Marker. */ +#define KS_NO_ROW_SELECTED -1 + enum class DualMarkerState; class KsDataStore; diff --git a/kernel-shark/src/KsTraceViewer.cpp b/kernel-shark/src/KsTraceViewer.cpp index 4b5bd29b..4e2c93e0 100644 --- a/kernel-shark/src/KsTraceViewer.cpp +++ b/kernel-shark/src/KsTraceViewer.cpp @@ -475,7 +475,7 @@ void KsTraceViewer::markSwitch() * The passive marker is not set. * Make sure that the model colors nothing. */ - _model.selectRow(!state, -1); + _model.selectRow(!state, KS_NO_ROW_SELECTED); } /* @@ -723,12 +723,12 @@ void KsTraceViewer::passiveMarkerSelectRow(int row) /** * Get the currently selected row. If no row is selected the function - * returns -1. + * returns KS_NO_ROW_SELECTED (-1). */ int KsTraceViewer::selectedRow() { QItemSelectionModel *sm = _view.selectionModel(); - int dataRow = -1; + int dataRow = KS_NO_ROW_SELECTED; if (sm->hasSelection()) { /* Only one row at the time can be selected. */ |