Various modifications and fixes toward KS 1.0
cover Various modifications and fixes toward KS 1.0
Most of the modifications are minor except patch [PATCH 08/12] which fixes a major memory leak.
Yordan Karadzhov (12):
kernel-shark: Fix a spelling typo in KsMainWindow class
kernel-shark: Fix a typo in an error message from libkshark-configio
kernel-shark: Make KsSession::importFromFile return status flag
kernel-shark: Error message if the opening of the session file fails
kernel-shark: Disables automatic quotation for errors in KsMainWindow
kernel-shark: Load Last Session from command line
kernel-shark: Add destructor for KsGLWidget
kernel-shark: Fix memory leak in KsPlotget::getTaskColorTable()
kernel-shark: Avoid the unnecessary calls of KsGLWidget::loadColors()
kernel-shark: Avoid 0/0 spliter ratio in KsSession
kernel-shark: In model, handle the case when all bins are empty
kernel-shark: In collections, handle the case when the data is small
kernel-shark/src/KsGLWidget.cpp | 8 ++++++-- kernel-shark/src/KsGLWidget.hpp | 2 ++ kernel-shark/src/KsMainWindow.cpp | 25 +++++++++++++++++-------- kernel-shark/src/KsMainWindow.hpp | 4 ++-- kernel-shark/src/KsPlotTools.cpp | 2 ++ kernel-shark/src/KsSession.cpp | 20 +++++++++++++++----- kernel-shark/src/KsSession.hpp | 2 +- kernel-shark/src/kernelshark.cpp | 9 ++++++++- kernel-shark/src/libkshark-collection.c | 20 ++++++++++++-------- kernel-shark/src/libkshark-configio.c | 2 +- kernel-shark/src/libkshark-model.c | 9 +++++---- 11 files changed, 71 insertions(+), 32 deletions(-)
Signature · 1 line
2.19.1
PATCH 1/12 kernel-shark: Fix a spelling typo in KsMainWindow class
_restorSession* -> _restoreSession*
^
--- kernel-shark/src/KsMainWindow.cpp | 12 ++++++------ kernel-shark/src/KsMainWindow.hpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)
kernel-shark/src/KsMainWindow.cpp +6 -6
@@ -43,7 +43,7 @@ KsMainWindow::KsMainWindow(QWidget *parent) _capture(this), _captureLocalServer(this), _openAction("Open", this), - _restorSessionAction("Restore Last Session", this), + _restoreSessionAction("Restore Last Session", this), _importSessionAction("Import Session", this), _exportSessionAction("Export Sassion", this), _quitAction("Quit", this),
@@ -167,9 +167,9 @@ void KsMainWindow::_createActions() connect(&_openAction, &QAction::triggered, this, &KsMainWindow::_open); - _restorSessionAction.setIcon(QIcon::fromTheme("document-open-recent")); - connect(&_restorSessionAction, &QAction::triggered, - this, &KsMainWindow::_restorSession); + _restoreSessionAction.setIcon(QIcon::fromTheme("document-open-recent")); + connect(&_restoreSessionAction, &QAction::triggered, + this, &KsMainWindow::_restoreSession); _importSessionAction.setIcon(QIcon::fromTheme("document-send")); _importSessionAction.setStatusTip("Load a session");
@@ -291,7 +291,7 @@ void KsMainWindow::_createMenus() sessions = file->addMenu("Sessions"); sessions->setIcon(QIcon::fromTheme("document-properties")); - sessions->addAction(&_restorSessionAction); + sessions->addAction(&_restoreSessionAction); sessions->addAction(&_importSessionAction); sessions->addAction(&_exportSessionAction); file->addAction(&_quitAction);
@@ -377,7 +377,7 @@ QString KsMainWindow::lastSessionFile() return QString(file) + "/lastsession.json"; } -void KsMainWindow::_restorSession() +void KsMainWindow::_restoreSession() { loadSession(lastSessionFile()); _graph.updateGeom();
kernel-shark/src/KsMainWindow.hpp +2 -2
@@ -99,7 +99,7 @@ private: // File menu. QAction _openAction; - QAction _restorSessionAction; + QAction _restoreSessionAction; QAction _importSessionAction;
@@ -155,7 +155,7 @@ private: void _open(); - void _restorSession(); + void _restoreSession(); void _importSession();
Signature · 1 line
2.19.1
PATCH 2/12 kernel-shark: Fix a typo in an error message from libkshark-configio
In reply to Yordan KaradzhovThe error message, printed whene kshark_open_json_file() fails, puts the period on a new line.
--- kernel-shark/src/libkshark-configio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel-shark/src/libkshark-configio.c +1 -1
@@ -1624,7 +1624,7 @@ static struct json_object *kshark_open_json_file(const char *file_name, fail:/* The document has a wrong type. */ -fprintf (stderr,"Failed to open Json file %s\n." , file_name); +fprintf (stderr,"Failed to open Json file %s.\n" , file_name);fprintf (stderr,"The document has a wrong type.\n" );json_object_put (jobj);
Signature · 1 line
2.19.1
PATCH 3/12 kernel-shark: Make KsSession::importFromFile return status flag
In reply to Yordan KaradzhovThe function has a better handling of the case when the session description file cannot be loaded. It returns true on success, otherwise false. We need this return flag in order to provide adequate error message in the case when this operation fails.
--- kernel-shark/src/KsSession.cpp | 14 ++++++++++---- kernel-shark/src/KsSession.hpp | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)
kernel-shark/src/KsSession.cpp +10 -4
@@ -28,13 +28,19 @@ KsSession::~KsSession() } /** Import a user session from a Json file. */ -void KsSession::importFromFile(QString jfileName) +bool KsSession::importFromFile(QString jfileName) { - if (_config) + kshark_config_doc *configTmp = + kshark_open_config_file(jfileName.toStdString().c_str(), + "kshark.config.session"); + + if (configTmp) { kshark_free_config_doc(_config); + _config = configTmp; + return true; + } - _config = kshark_open_config_file(jfileName.toStdString().c_str(), - "kshark.config.session"); + return false; } /** Export the current user session from a Json file. */
kernel-shark/src/KsSession.hpp +1 -1
@@ -37,7 +37,7 @@ public: /** Get the configuration document object. */ kshark_config_doc *getConfDocPtr() const {return _config;} - void importFromFile(QString jfileName); + bool importFromFile(QString jfileName); void exportToFile(QString jfileName);
Signature · 1 line
2.19.1
PATCH 4/12 kernel-shark: Error message if the opening of the session file fails
In reply to Yordan KaradzhovHere we add proper handling of the case when the loading of the session description file fails.
--- kernel-shark/src/KsMainWindow.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
kernel-shark/src/KsMainWindow.cpp +10 -1
@@ -1010,7 +1010,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));
Signature · 1 line
2.19.1
Re: [PATCH 04/12] kernel-shark: Error message if the opening of the session file fails
Quoted 14 lines · Yordan Karadzhov
Here we add proper handling of the case when the loading of the session description file fails.
Signed-off-by Yordan Karadzhov <[email protected]>--- kernel-shark/src/KsMainWindow.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)kernel-shark/src/KsMainWindow.cpp +0
-0
kernel-shark/src/KsMainWindow.cpp void KsMainWindow::loadSession(const QString &fileName) · line 1017
Quoted 9 lines
kernel-shark/src/KsMainWindow.cpp +5
-1@@ -1010,7 +1010,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");
Imo this is cleaner with string interpolation, e.g.
QString text = QString("Unable to open session description
file %1.\n").arg(fileName);
-- Slavi
Quoted 11 lines
kernel-shark/src/KsMainWindow.cpp +5
-1+ _error(text, "loadSessErr1", true, true); + + return; + } + _session.loadPlugins(kshark_ctx, &_plugins); QString dataFile(_session.getDataFile(kshark_ctx)); --2.19.1
PATCH 5/12 kernel-shark: Disables automatic quotation for errors in KsMainWindow
In reply to Yordan KaradzhovWhen quoting in the output stream is disabled, the text of the message is printed without quotations and without escaping of non-printable characters.
example output with quoting enabled:
ERROR: "Unable to open trace data file for session mysession.json\n"
and with quoting disabled:
ERROR: Unable to open session description file mysession.json.
--- kernel-shark/src/KsMainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel-shark/src/KsMainWindow.cpp +1 -1
@@ -980,7 +980,7 @@ void KsMainWindow::_error(const QString &text, const QString &errCode, if (unloadPlugins) _plugins.unloadAll(); - qCritical() << "ERROR: " << text; + qCritical().noquote() << "ERROR: " << text; em->showMessage(text, errCode); em->exec(); }
Signature · 1 line
2.19.1
PATCH 6/12 kernel-shark: Load Last Session from command line
In reply to Yordan Karadzhov./kernelshark -l will load directly the Last Session
--- kernel-shark/src/kernelshark.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel-shark/src/kernelshark.cpp +8 -1
@@ -28,6 +28,7 @@ void usage(const char *prog) printf(" -p register plugin, use plugin name, absolute or relative path\n"); printf(" -u unregister plugin, use plugin name or absolute path\n"); printf(" -s import a session\n"); + printf(" -l import the last session\n"); } int main(int argc, char **argv)
@@ -40,7 +41,7 @@ int main(int argc, char **argv) int c; bool fromSession = false; - while ((c = getopt(argc, argv, "hvi:p:u:s:")) != -1) { + while ((c = getopt(argc, argv, "hvi:p:u:s:l")) != -1) { switch(c) { case 'h': usage(argv[0]);
@@ -65,6 +66,12 @@ int main(int argc, char **argv) case 's': ks.loadSession(QString(optarg)); fromSession = true; + break; + + case 'l': + ks.loadSession(ks.lastSessionFile()); + fromSession = true; + break; default: break;
Signature · 1 line
2.19.1
Re: [PATCH 06/12] kernel-shark: Load Last Session from command line
Quoted 29 lines · On Thu, 14 Mar 2019 17:10:06 +0200 Yordan Karadzhov <[email protected]>…
./kernelshark -l will load directly the Last Session
Signed-off-by Yordan Karadzhov <[email protected]>--- kernel-shark/src/kernelshark.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)kernel-shark/src/kernelshark.cpp +2
-1@@ -28,6 +28,7 @@ void usage(const char *prog) printf(" -p register plugin, use plugin name, absolute or relative path\n"); printf(" -u unregister plugin, use plugin name or absolute path\n"); printf(" -s import a session\n"); + printf(" -l import the last session\n"); } int main(int argc, char **argv)@@ -40,7 +41,7 @@ int main(int argc, char **argv) int c; bool fromSession = false; - while ((c = getopt(argc, argv, "hvi:p:u:s:")) != -1) { + while ((c = getopt(argc, argv, "hvi:p:u:s:l")) != -1) { switch(c) { case 'h': usage(argv[0]);
kernel-shark/src/kernelshark.cpp int main(int argc, char **argv) · line 74
Quoted 9 lines
kernel-shark/src/kernelshark.cpp +6
-0@@ -65,6 +66,12 @@ int main(int argc, char **argv) case 's': ks.loadSession(QString(optarg)); fromSession = true; + break; + + case 'l': + ks.loadSession(ks.lastSessionFile()); + fromSession = true; + break;
This produces:
[ 69%] Building CXX object src/CMakeFiles/kernelshark.dir/kernelshark.cpp.o /work/git/trace-cmd.git/kernel-shark/src/kernelshark.cpp: In function ‘int main(int, char**)’:
/work/git/trace-cmd.git/kernel-shark/src/kernelshark.cpp:72:22: error: ‘class KsMainWindow’ has no member named ‘lastSessionFile’; did you mean ‘loadSession’?
ks.loadSession(ks.lastSessionFile());
^~~~~~~~~~~~~~~
loadSessionAm I missing something?
-- Steve
Quoted 3 lines
kernel-shark/src/kernelshark.cpp +0
-0default: break;
Re: [PATCH 06/12] kernel-shark: Load Last Session from command line
Quoted 47 lines · Steven Rostedt
Quoted 29 lines · On Thu, 14 Mar 2019 17:10:06 +0200 Yordan Karadzhov <[email protected]>…
./kernelshark -l will load directly the Last Session
Signed-off-by Yordan Karadzhov <[email protected]>--- kernel-shark/src/kernelshark.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)kernel-shark/src/kernelshark.cpp +2
-1@@ -28,6 +28,7 @@ void usage(const char *prog) printf(" -p register plugin, use plugin name, absolute or relative path\n"); printf(" -u unregister plugin, use plugin name or absolute path\n"); printf(" -s import a session\n"); + printf(" -l import the last session\n"); } int main(int argc, char **argv)@@ -40,7 +41,7 @@ int main(int argc, char **argv) int c; bool fromSession = false; - while ((c = getopt(argc, argv, "hvi:p:u:s:")) != -1) { + while ((c = getopt(argc, argv, "hvi:p:u:s:l")) != -1) { switch(c) { case 'h': usage(argv[0]);kernel-shark/src/kernelshark.cpp int main(int argc, char **argv) · line 74
Quoted 9 lines
kernel-shark/src/kernelshark.cpp +6
-0@@ -65,6 +66,12 @@ int main(int argc, char **argv) case 's': ks.loadSession(QString(optarg)); fromSession = true; + break; + + case 'l': + ks.loadSession(ks.lastSessionFile()); + fromSession = true; + break;This produces:
[ 69%] Building CXX object
src/CMakeFiles/kernelshark.dir/kernelshark.cpp.o/work/git/trace-cmd.git/kernel-shark/src/kernelshark.cpp: In function ‘intmain(int, char**)’:
/work/git/trace-cmd.git/kernel-shark/src/kernelshark.cpp:72:22: error: ‘class KsMainWindow’ has no member named ‘lastSessionFile’; did you mean ‘loadSession’?
Quoted 7 lines
ks.loadSession(ks.lastSessionFile()); ^~~~~~~~~~~~~~~ loadSessionAm I missing something?
Looks like you are missing the two previous patch sets:
[PATCH v2 0/3] Tuning the KernelShark build system and
[PATCH v2 0/4] Add dialog for loading user-defined plugins
Thanks!
Yordan
Quoted 6 lines
-- Steve
Quoted 3 lines
kernel-shark/src/kernelshark.cpp +0
-0default: break;
Re: [PATCH 06/12] kernel-shark: Load Last Session from command line
Quoted 8 lines · On Fri, 15 Mar 2019 08:13:10 +0200 "Yordan Karadzhov (VMware)"…
Quoted 2 lines
Am I missing something?
Looks like you are missing the two previous patch sets:
[PATCH v2 0/3] Tuning the KernelShark build system and
[PATCH v2 0/4] Add dialog for loading user-defined plugins
Please make sure to mention dependencies in the 0/X patch change log. Each patch set should be stand alone unless explicitly stated otherwise.
As when you get a lot of change series, you may go backwards in accepting them (which is what I do).
-- Steve
PATCH 7/12 kernel-shark: Add destructor for KsGLWidget
In reply to Yordan KaradzhovNot sure how I missed to define this destructor before. The good thing is that the GUI has only one GL widget, and this widget stays alive for the whole duration of the program.
--- kernel-shark/src/KsGLWidget.cpp | 6 ++++++ kernel-shark/src/KsGLWidget.hpp | 2 ++ 2 files changed, 8 insertions(+)
kernel-shark/src/KsGLWidget.cpp +6 -0
@@ -40,6 +40,12 @@ KsGLWidget::KsGLWidget(QWidget *parent) connect(&_model, SIGNAL(modelReset()), this, SLOT(update())); } +KsGLWidget::~KsGLWidget() +{ + for (auto &g: _graphs) + delete g; +} + /** Reimplemented function used to set up all required OpenGL resources. */ void KsGLWidget::initializeGL() {
kernel-shark/src/KsGLWidget.hpp +2 -0
@@ -31,6 +31,8 @@ class KsGLWidget : public QOpenGLWidget public: explicit KsGLWidget(QWidget *parent = NULL); + ~KsGLWidget(); + void initializeGL() override; void resizeGL(int w, int h) override;
Signature · 1 line
2.19.1
PATCH 8/12 kernel-shark: Fix memory leak in KsPlotget::getTaskColorTable()
In reply to Yordan KaradzhovThe std::vector constructor used here makes a copy of the data, so the memory used by the original array has to be freed.
This is a major leak because getTaskColorTable() gets called every time when we redraw the plots.
BTW calling getTaskColorTable() every time when we redraw makes no sense. This will be fixed in the following patch.
--- kernel-shark/src/KsPlotTools.cpp | 2 ++ 1 file changed, 2 insertions(+)
kernel-shark/src/KsPlotTools.cpp +2 -0
@@ -122,6 +122,8 @@ ColorTable getTaskColorTable() std::vector<int> temp_pids(pids, pids + nTasks); std::sort(temp_pids.begin(), temp_pids.end()); + free(pids); + if (temp_pids[i] == 0) { /* The "Idle" process (pid = 0) will be plotted in black. */ colors[i++] = {};
Signature · 1 line
2.19.1
PATCH 9/12 kernel-shark: Avoid the unnecessary calls of KsGLWidget::loadColors()
In reply to Yordan KaradzhovThe tables of colors used by the OpenGL widget have to be updated only when we load a new trace data file.
--- kernel-shark/src/KsGLWidget.cpp | 2 -- 1 file changed, 2 deletions(-)
kernel-shark/src/KsGLWidget.cpp +0 -2
@@ -86,8 +86,6 @@ void KsGLWidget::paintGL() { glClear(GL_COLOR_BUFFER_BIT); - loadColors(); - /* Draw the time axis. */ if(_data) _drawAxisX();
Signature · 1 line
2.19.1
PATCH 10/12 kernel-shark: Avoid 0/0 spliter ratio in KsSession
In reply to Yordan KaradzhovSometimes when we save the session QSplitter::sizes() returns 0/0 ratio (no idea why). Later when we load the session the 0/0 ratio results in misbehavior of the splitter position.
--- kernel-shark/src/KsSession.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel-shark/src/KsSession.cpp +5 -1
@@ -256,7 +256,7 @@ void KsSession::loadSplitterSize(QSplitter *splitter) { kshark_config_doc *spl = kshark_config_alloc(KS_CONFIG_JSON); json_object *jspl, *jgraphsize, *jviewsize; - int graphSize, viewSize; + int graphSize(1), viewSize(1); QList<int> sizes; if (!kshark_config_doc_get(_config, "Splitter", spl))
@@ -269,6 +269,10 @@ void KsSession::loadSplitterSize(QSplitter *splitter) graphSize = json_object_get_int(jgraphsize); viewSize = json_object_get_int(jviewsize); + if (graphSize == 0 && viewSize == 0) { + /* 0/0 spliter ratio is undefined. Make it 1/1. */ + viewSize = graphSize = 1; + } } sizes << graphSize << viewSize;
Signature · 1 line
2.19.1
PATCH 11/12 kernel-shark: In model, handle the case when all bins are empty
In reply to Yordan Karadzhovksmodel_set_bin_counts() should not crash in the case when all bins of the model, except the Upper Overflow bin, are empty.
--- kernel-shark/src/libkshark-model.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
kernel-shark/src/libkshark-model.c +5 -4
@@ -290,7 +290,7 @@ static void ksmodel_set_next_bin_edge(struct kshark_trace_histo *histo,static void ksmodel_set_bin_counts (struct kshark_trace_histo *histo) {int i =0 , prev_not_empty; -ssize_t count_tmp; +ssize_t count_tmp =0 ; histo->tot_count =0 ; memset(&histo->bin_count[0], 0,
@@ -303,7 +303,7 @@ static void ksmodel_set_bin_counts(struct kshark_trace_histo *histo) prev_not_empty =LOB (histo); }else {/* Loop till the first non-empty bin. */ -while (histo->map[i] <0 ) { +while (histo->map[i] <0 && i < histo->n_bins) { ++i; }
@@ -316,7 +316,8 @@ static void ksmodel_set_bin_counts(struct kshark_trace_histo *histo)*/ for (; i < histo->n_bins; ++i) {if (histo->map[i] !=KS_EMPTY_BIN ) { -/* The current bin is not empty, take its data row and +/* +* The current bin is not empty, take its data row and * subtract it from the data row of the previous not * empty bin, which will give us the number of data * rows in the "prev_not_empty" bin.
@@ -358,7 +359,7 @@ static void ksmodel_set_bin_counts(struct kshark_trace_histo *histo)* We will do a sanity check. The number of data rows in the last not * empty bin must be greater than zero. */ -assert (count_tmp >0 ); +assert (count_tmp >=0 ); histo->tot_count += histo->bin_count[prev_not_empty] = count_tmp; }
Signature · 1 line
2.19.1
Re: [PATCH 11/12] kernel-shark: In model, handle the case when all bins are empty
Quoted 23 lines · Yordan Karadzhov
ksmodel_set_bin_counts()should not crash in the case when all bins of the model, except the Upper Overflow bin, are empty.Signed-off-by Yordan Karadzhov <[email protected]>--- kernel-shark/src/libkshark-model.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)kernel-shark/src/libkshark-model.c +1
-1@@ -290,7 +290,7 @@ static void ksmodel_set_next_bin_edge(struct kshark_trace_histo *histo,static void ksmodel_set_bin_counts (struct kshark_trace_histo *histo) {int i =0 , prev_not_empty; -ssize_t count_tmp; +ssize_t count_tmp =0 ; histo->tot_count =0 ; memset(&histo->bin_count[0], 0,
kernel-shark/src/libkshark-model.c static void ksmodel_set_bin_counts(struct kshark_trace_histo *histo) · line 306
Quoted 5 lines
kernel-shark/src/libkshark-model.c +1
-1@@ -303,7 +303,7 @@ static void ksmodel_set_bin_counts(struct kshark_trace_histo *histo) prev_not_empty =LOB (histo); }else {/* Loop till the first non-empty bin. */ -while (histo->map[i] <0 ) { +while (histo->map[i] <0 && i < histo->n_bins) {
I would suggest switching the order of those checks
while (i < histo->n_bins && histo->map[i] < 0) {It's safe as is since hist->map has histo->n_bins+2 entries but checking bounds before dereferencing is more idiomatic.
-- Slavi
Quoted 25 lines
kernel-shark/src/libkshark-model.c +3
-3++i; }@@ -316,7 +316,8 @@ static void ksmodel_set_bin_counts(struct kshark_trace_histo *histo)*/ for (; i < histo->n_bins; ++i) {if (histo->map[i] !=KS_EMPTY_BIN ) { -/* The current bin is not empty, take its data row and +/* +* The current bin is not empty, take its data row and * subtract it from the data row of the previous not * empty bin, which will give us the number of data * rows in the "prev_not_empty" bin. @@ -358,7 +359,7 @@ static void ksmodel_set_bin_counts(struct kshark_trace_histo *histo)* We will do a sanity check. The number of data rows in the last not * empty bin must be greater than zero. */ -assert (count_tmp >0 ); +assert (count_tmp >=0 ); histo->tot_count += histo->bin_count[prev_not_empty] = count_tmp; } --2.19.1
Signature · 1 line
Slavomir Kaslev
PATCH 12/12 kernel-shark: In collections, handle the case when the data is small
In reply to Yordan KaradzhovIn particular, handle the case when the size of the data is smaller than the required margin.
--- kernel-shark/src/libkshark-collection.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
kernel-shark/src/libkshark-collection.c +12 -8
@@ -71,7 +71,7 @@ static bool collection_add_entry(struct entry_list **list,static struct kshark_entry_collection * kshark_data_collection_alloc(struct kshark_context *kshark_ctx, struct kshark_entry **data, - size_t first, + ssize_t first, size_t n_rows, matching_condition_func cond, int val,
@@ -81,9 +81,19 @@ kshark_data_collection_alloc(struct kshark_context *kshark_ctx,struct kshark_entry *last_vis_entry =NULL ;struct entry_list *col_list, *temp;size_t resume_count =0 , break_count =0 ; -size_t i, j, end, last_added =0 ; +size_t i, j, last_added =0 ; +ssize_t end;bool good_data = false; +/* Create the collection. */ + col_ptr =calloc (1 ,sizeof (*col_ptr)); +if (!col_ptr) + goto fail; + + end = first + n_rows - margin; +if (first >= end) +return col_ptr; + col_list =malloc (sizeof (*col_list));if (!col_list) goto fail;
@@ -106,7 +116,6 @@ kshark_data_collection_alloc(struct kshark_context *kshark_ctx, temp->type =COLLECTION_IGNORE ; } - end = first + n_rows - margin;for (i = first + margin; i < end; ++i) {if (!cond (kshark_ctx, data[i], val)) {/*
@@ -204,11 +213,6 @@ kshark_data_collection_alloc(struct kshark_context *kshark_ctx,*/ assert (break_count == resume_count); -/* Create the collection. */ - col_ptr =malloc (sizeof (*col_ptr)); -if (!col_ptr) - goto fail; - col_ptr->next =NULL ; col_ptr->resume_points = calloc(resume_count,
Signature · 1 line
2.19.1