kernel-shark: Fix all warnings showing when bulding with gcc 10.2.1
PATCH v2 1/3 kernel-shark: Fix all warnings showing when bulding with gcc 10.2.1
Tested on Fedora 32:
gcc (GCC) 10.2.1 20200723 (Red Hat 10.2.1-1)
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- src/KsAdvFilteringDialog.cpp | 6 +++--- src/KsCaptureDialog.cpp | 2 +- src/KsTraceGraph.cpp | 36 +++++++++++++++++++++--------------- src/KsTraceGraph.hpp | 2 ++ src/KsUtils.cpp | 4 ++-- src/KsUtils.hpp | 6 +++--- src/KsWidgetsLib.cpp | 6 +++--- 7 files changed, 35 insertions(+), 27 deletions(-)
src/KsAdvFilteringDialog.cpp +3 -3
@@ -170,7 +170,7 @@ void KsAdvFilteringDialog::_setSystemCombo(struct kshark_context *kshark_ctx) } } - qSort(sysList); + std::sort(sysList.begin(), sysList.end()); _systemComboBox.addItems(sysList); i = _systemComboBox.findText("ftrace");
@@ -291,7 +291,7 @@ void KsAdvFilteringDialog::_systemChanged(const QString &sysName) evtsList << events[i]->name; } - qSort(evtsList); + std::sort(evtsList.begin(), evtsList.end()); _eventComboBox.addItems(evtsList); i = _eventComboBox.findText("function");
@@ -310,7 +310,7 @@ KsAdvFilteringDialog::_getEventFormatFields(struct tep_event *event) free(fields); - qSort(fieldList); + std::sort(fieldList.begin(), fieldList.end()); return fieldList; }
src/KsCaptureDialog.cpp +1 -1
@@ -219,7 +219,7 @@ QStringList KsCaptureControl::_getPlugins() } free (all_plugins); - qSort(pluginList); + std::sort(pluginList.begin(), pluginList.end()); return pluginList; }
src/KsTraceGraph.cpp +21 -15
@@ -279,14 +279,25 @@ void KsTraceGraph::_stopUpdating() _keyPressed = false; } +QString KsTraceGraph::_t2str(uint64_t sec, uint64_t usec) { + QString usecStr; + QTextStream ts(&usecStr); + + ts.setFieldAlignment(QTextStream::AlignRight); + ts.setFieldWidth(6); + ts.setPadChar('0'); + + ts << usec; + + return QString::number(sec) + "." + usecStr; +} + void KsTraceGraph::_resetPointer(uint64_t ts, int cpu, int pid) { uint64_t sec, usec; - QString pointer; kshark_convert_nano(ts, &sec, &usec); - pointer.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); - _labelP2.setText(pointer); + _labelP2.setText(_t2str(sec, usec)); if (pid > 0 && cpu >= 0) { struct kshark_context *kshark_ctx(NULL);
@@ -316,13 +327,12 @@ void KsTraceGraph::_setPointerInfo(size_t i) QString lat(kshark_get_latency_easy(e)); QString info(kshark_get_info_easy(e)); QString comm(kshark_get_task_easy(e)); - QString pointer, elidedText; int labelWidth, width; + QString elidedText; uint64_t sec, usec; kshark_convert_nano(e->ts, &sec, &usec); - pointer.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); - _labelP2.setText(pointer); + _labelP2.setText(_t2str(sec, usec)); comm.append("-"); comm.append(QString("%1").arg(kshark_get_pid_easy(e)));
@@ -445,7 +455,7 @@ void KsTraceGraph::addCPUPlot(int cpu) return; _glWindow._cpuList.append(cpu); - qSort(_glWindow._cpuList); + std::sort(_glWindow._cpuList.begin(), _glWindow._cpuList.end()); _selfUpdate(); }
@@ -456,7 +466,7 @@ void KsTraceGraph::addTaskPlot(int pid) return; _glWindow._taskList.append(pid); - qSort(_glWindow._taskList); + std::sort(_glWindow._taskList.begin(), _glWindow._taskList.end()); _selfUpdate(); }
@@ -606,21 +616,17 @@ void KsTraceGraph::_updateGraphLegends() void KsTraceGraph::_updateTimeLegends() { uint64_t sec, usec, tsMid; - QString tMin, tMid, tMax; kshark_convert_nano(_glWindow.model()->histo()->min, &sec, &usec); - tMin.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); - _labelXMin.setText(tMin); + _labelXMin.setText(_t2str(sec, usec)); tsMid = (_glWindow.model()->histo()->min + _glWindow.model()->histo()->max) / 2; kshark_convert_nano(tsMid, &sec, &usec); - tMid.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); - _labelXMid.setText(tMid); + _labelXMid.setText(_t2str(sec, usec)); kshark_convert_nano(_glWindow.model()->histo()->max, &sec, &usec); - tMax.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); - _labelXMax.setText(tMax); + _labelXMax.setText(_t2str(sec, usec)); } /**
src/KsTraceGraph.hpp +2 -0
@@ -108,6 +108,8 @@ private: void _markerReDraw(); + QString _t2str(uint64_t sec, uint64_t usec); + enum class GraphActions { ZoomIn, ZoomOut,
src/KsUtils.cpp +2 -2
@@ -48,7 +48,7 @@ QVector<int> getPidList() free(tempPids); - qSort(pids); + std::sort(pids.begin(), pids.end()); return pids; }
@@ -90,7 +90,7 @@ QVector<int> getFilterIds(tracecmd_filter_id *filter) for (int i = 0; i < n; ++i) v.append(cpuFilter[i]); - qSort(v); + std::sort(v.begin(), v.end()); free(cpuFilter); return v;
src/KsUtils.hpp +3 -3
@@ -25,10 +25,10 @@ #include "KsPlotTools.hpp" /** Macro providing the height of the screen in pixels. */ -#define SCREEN_HEIGHT QApplication::desktop()->screenGeometry().height() +#define SCREEN_HEIGHT QGuiApplication::screens()[0]->geometry().height() /** Macro providing the width of the screen in pixels. */ -#define SCREEN_WIDTH QApplication::desktop()->screenGeometry().width() +#define SCREEN_WIDTH QGuiApplication::screens()[0]->geometry().width() //! @cond Doxygen_Suppress
@@ -45,7 +45,7 @@ static auto stringWidth = [](QString s) QFont font; QFontMetrics fm(font); - return fm.width(s); + return fm.horizontalAdvance(s); }; //! @endcond
src/KsWidgetsLib.cpp +3 -3
@@ -642,7 +642,7 @@ KsCPUCheckBoxWidget::KsCPUCheckBoxWidget(struct tep_handle *tep, cpuItem->setText(0, " "); cpuItem->setText(1, QString("CPU %1").arg(i)); cpuItem->setCheckState(0, Qt::Checked); - cpuItem->setBackgroundColor(0, QColor(colors[i].r(), + cpuItem->setBackground(0, QColor(colors[i].r(), colors[i].g(), colors[i].b())); _tree.addTopLevelItem(cpuItem);
@@ -799,12 +799,12 @@ KsTasksCheckBoxWidget::KsTasksCheckBoxWidget(struct tep_handle *pevent, comm = tep_data_comm_from_pid(kshark_ctx->pevent, pid); comItem = new QTableWidgetItem(tr(comm)); - pidItem->setBackgroundColor(QColor(colors[pid].r(), + pidItem->setBackground(QColor(colors[pid].r(), colors[pid].g(), colors[pid].b())); if (_id[i] == 0) - pidItem->setTextColor(Qt::white); + pidItem->setForeground(Qt::white); _table.setItem(i, 2, comItem); }
Signature · 1 line
2.25.1
PATCH v2 2/3 kernel-shark: Check if Qt has been found when building the examples
Some of the examples depend on Qt. Check is Qt exists befor trying to build these examples.
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- examples/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
examples/CMakeLists.txt +10 -6
@@ -20,10 +20,14 @@ message(STATUS "dataplot") add_executable(dplot dataplot.cpp) target_link_libraries(dplot kshark-plot) -message(STATUS "widgetdemo") -add_executable(widgetdemo widgetdemo.cpp) -target_link_libraries(widgetdemo kshark-gui) +if (Qt5Widgets_FOUND) -message(STATUS "cmd_split") -add_executable(cmd_split cmd_split.cpp) -target_link_libraries(cmd_split kshark-gui) + message(STATUS "widgetdemo") + add_executable(widgetdemo widgetdemo.cpp) + target_link_libraries(widgetdemo kshark-gui) + + message(STATUS "cmd_split") + add_executable(cmd_split cmd_split.cpp) + target_link_libraries(cmd_split kshark-gui) + +endif (Qt5Widgets_FOUND)
Signature · 1 line
2.25.1
PATCH v2 3/3 kernel-shark: Fix symbol resolving during linking
In reply to Yordan Karadzhov (VMware)libtraceevent is the basic library. libtracefs depends on libtraceevent and libtracecmd depends on both libtracefs and libtraceevent. Having this in mind, we need to properly order those 3 libraries when linking the basic library of the KernelShark API (libkshark).
Signed-off-by Yordan Karadzhov (VMware) <[email protected]>
--- src/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
src/CMakeLists.txt +4 -7
@@ -7,9 +7,9 @@ add_library(kshark SHARED libkshark.c libkshark-configio.c libkshark-collection.c) -target_link_libraries(kshark ${TRACEEVENT_LIBRARY} - ${TRACECMD_LIBRARY} +target_link_libraries(kshark ${TRACECMD_LIBRARY} ${TRACEFS_LIBRARY} + ${TRACEEVENT_LIBRARY} ${JSONC_LIBRARY} ${CMAKE_DL_LIBS})
@@ -67,11 +67,8 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) target_link_libraries(kshark-gui kshark-plot Qt5::Widgets - Qt5::Network - ${TRACEEVENT_LIBRARY} - ${TRACECMD_LIBRARY} - ${TRACEFS_LIBRARY} - ${CMAKE_DL_LIBS}) + Qt5::Network) + set_target_properties(kshark-gui PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}")
Signature · 1 line
2.25.1