kernelshark: Fix ups due to rebase Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
diff --git a/kernel-shark/src/KsGLWidget.cpp b/kernel-shark/src/KsGLWidget.cpp index f0b1c8f..a433c07 100644 --- a/kernel-shark/src/KsGLWidget.cpp +++ b/kernel-shark/src/KsGLWidget.cpp
@@ -43,8 +43,10 @@ KsGLWidget::~KsGLWidget() { - for (auto &g: _graphs) - delete g; + for (auto &stream: _graphs) { + for (auto &g: stream) + delete g; + } } /** Reimplemented function used to set up all required OpenGL resources. */
diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index 222b8ad..19a7997 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp
@@ -963,7 +963,7 @@ if (fileNames.isEmpty()) return; - _plugins.addPlugins(fileNames); +// _plugins.addPlugins(fileNames); } void KsMainWindow::_record()
diff --git a/kernel-shark/src/KsUtils.cpp b/kernel-shark/src/KsUtils.cpp index 49b8a3b..3848df7 100644 --- a/kernel-shark/src/KsUtils.cpp +++ b/kernel-shark/src/KsUtils.cpp
@@ -794,6 +794,7 @@ } } +#if 0 /** @brief Add to the list and initialize user-provided plugins. All other * previously loaded plugins will be reinitialized and the data will be * reloaded. @@ -816,6 +817,7 @@ emit dataReload(); } +#endif /** Unload all plugins. */ void KsPluginManager::unloadAll()
diff --git a/kernel-shark/src/plugins/sched_events.c b/kernel-shark/src/plugins/sched_events.c index 02b461d..27a27cf 100644 --- a/kernel-shark/src/plugins/sched_events.c +++ b/kernel-shark/src/plugins/sched_events.c
@@ -87,8 +87,7 @@ "sched", "sched_switch"); if (!event) { fprintf(stderr, "No sched_switch events in stream %i.\n", sd); - plugin_free_context(plugin_ctx); - plugin_sched_context_handler = NULL; + free(plugin_ctx); return false; }