From patchwork Wed Sep 30 15:07:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11809347 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3DFB3618 for ; Wed, 30 Sep 2020 15:08:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1BF3820789 for ; Wed, 30 Sep 2020 15:08:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P77JX54G" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728149AbgI3PIH (ORCPT ); Wed, 30 Sep 2020 11:08:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725385AbgI3PIH (ORCPT ); Wed, 30 Sep 2020 11:08:07 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 450ACC061755 for ; Wed, 30 Sep 2020 08:08:07 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id a9so2170854wmm.2 for ; Wed, 30 Sep 2020 08:08:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=usR3R8yFGdNfThG0NRroYuDv45MtH8w8x4GjxNoK9Ek=; b=P77JX54G0mOEmlm/75hHWEg6NzBlI47GXERKUFfycbua6e+X67OJP6cmQnI2KnQMwR 2K7GHq4dvNd2a69IABGRK6/32dR5qCbkVT2yLDsJP18AiYnR0T57E0NMqWO6KIj2Sc1g MinVlagK0KdTN0D9BFzF7deUL/VOXYO8EP6Yt+IqeqyBWOPtkDcVODx2jMW3Ko0ugI6F EReI0ibR8JAdEbFwMhgl8VlL/z0sP+L4Gd1oIB5oBVU5+AH6R9ZoH+L76eIjQ3vWi2qI J2pNJLeb/fsfoM4lmQ/7aMHcbUXPBBVVSnS4BjJAGu243hEPwfb5td4JL/6nVnSfOFMB 7TqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=usR3R8yFGdNfThG0NRroYuDv45MtH8w8x4GjxNoK9Ek=; b=hXhwJho1qDe53A1cCQF9zgRNGtSIfUvpNaRVrD9EZGnrvwqKaO6ZGXV+oTtw0g77GA iBT4eMFTn297qBhFpyNTJqONGDr58/aBWTDZhEfPBYK385DYYDV05+Bm2JNm+KtSf/M6 P7VPCsLjZVMALuyRQ3OymaevUBe3TE/lvaiolRaJymrEirK1/IFG9y808qoXlgcTjUlU hHedyJeg17MPxQQT36Iz+tuF9t5U5xBly+BDgpC5dyUe/Wipi2gmZeIoxxB5k0/NcNJG gHR523XYa2wkObLFMeiiIs0qp3rUrPGhere9h0PkwpIrXep0q/DEZNyvD6W26LJ/PoHh 2e6Q== X-Gm-Message-State: AOAM531CoGY0v4/XHErNr/zoEGXIS9YPMzNxIiaA9vl0M0I25QrAulaa qN4b7LexghvJAkuKlw3Ux7hamyCGipo= X-Google-Smtp-Source: ABdhPJwF6cF2Xzyj5URDp7BjynrxLZpb/kiCbqi0c3Ur8mFnTA0UZPb5elwwQqrGBQRzySSJgrMYzQ== X-Received: by 2002:a1c:7514:: with SMTP id o20mr3482198wmc.76.1601478485815; Wed, 30 Sep 2020 08:08:05 -0700 (PDT) Received: from localhost.localdomain ([84.40.93.108]) by smtp.gmail.com with ESMTPSA id k4sm3613486wrx.51.2020.09.30.08.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 08:08:04 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 1/3] kernel-shark: Fix all warnings showing when bulding with gcc 10.2.1 Date: Wed, 30 Sep 2020 18:07:39 +0300 Message-Id: <20200930150741.224779-1-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Tested on Fedora 32: gcc (GCC) 10.2.1 20200723 (Red Hat 10.2.1-1) Signed-off-by: Yordan Karadzhov (VMware) --- 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(-) diff --git a/src/KsAdvFilteringDialog.cpp b/src/KsAdvFilteringDialog.cpp index 6af1aea..8dc53bb 100644 --- a/src/KsAdvFilteringDialog.cpp +++ b/src/KsAdvFilteringDialog.cpp @@ -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; } diff --git a/src/KsCaptureDialog.cpp b/src/KsCaptureDialog.cpp index d6f8014..63fd5d6 100644 --- a/src/KsCaptureDialog.cpp +++ b/src/KsCaptureDialog.cpp @@ -219,7 +219,7 @@ QStringList KsCaptureControl::_getPlugins() } free (all_plugins); - qSort(pluginList); + std::sort(pluginList.begin(), pluginList.end()); return pluginList; } diff --git a/src/KsTraceGraph.cpp b/src/KsTraceGraph.cpp index 90f83f3..7b656c0 100644 --- a/src/KsTraceGraph.cpp +++ b/src/KsTraceGraph.cpp @@ -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)); } /** diff --git a/src/KsTraceGraph.hpp b/src/KsTraceGraph.hpp index c53258c..0eeef14 100644 --- a/src/KsTraceGraph.hpp +++ b/src/KsTraceGraph.hpp @@ -108,6 +108,8 @@ private: void _markerReDraw(); + QString _t2str(uint64_t sec, uint64_t usec); + enum class GraphActions { ZoomIn, ZoomOut, diff --git a/src/KsUtils.cpp b/src/KsUtils.cpp index 8c61b3f..24f7178 100644 --- a/src/KsUtils.cpp +++ b/src/KsUtils.cpp @@ -48,7 +48,7 @@ QVector getPidList() free(tempPids); - qSort(pids); + std::sort(pids.begin(), pids.end()); return pids; } @@ -90,7 +90,7 @@ QVector 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; diff --git a/src/KsUtils.hpp b/src/KsUtils.hpp index 9adacd8..2772b84 100644 --- a/src/KsUtils.hpp +++ b/src/KsUtils.hpp @@ -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 diff --git a/src/KsWidgetsLib.cpp b/src/KsWidgetsLib.cpp index 330230e..a84aff3 100644 --- a/src/KsWidgetsLib.cpp +++ b/src/KsWidgetsLib.cpp @@ -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); } From patchwork Wed Sep 30 15:07:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11809351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 05F60139A for ; Wed, 30 Sep 2020 15:08:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD03F20789 for ; Wed, 30 Sep 2020 15:08:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fyat5Fsu" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728663AbgI3PIM (ORCPT ); Wed, 30 Sep 2020 11:08:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728385AbgI3PIL (ORCPT ); Wed, 30 Sep 2020 11:08:11 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1367DC061755 for ; Wed, 30 Sep 2020 08:08:10 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id t17so2161960wmi.4 for ; Wed, 30 Sep 2020 08:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ebrbdevgi6FUEgGptFpxVEWU1y5LoDhpQCpoVTGFgpI=; b=fyat5Fsu5MG/9Un8114IB5bklZ49fXn9L00MJSTmzJb7l3bZoJxsMWs2aLZUB+r8AY D1fBpdCtcCVgwODJByOZrRo/T4uYlnGvBYM/2IFBV00JkYo1Et8HeedHzfwbk+/Y+mjj bVbWVGS7OUUtu6SlmnhgC8H9A7ch0CZNqTcC5fuXUv+xOJbpEKy9jirItD0Zg14Vnypx ImXGRgZ2/hl9ljk4eJMKthO9MDm9rn40AbRQ/RYq++wCCS576ljxyLO9/zHIW4878UXY utkLs5/UnZg+3AEQWdsUZeRfSn7GkERDZXzjHXVoy8D7F7GRN2/bIcRIKEEkojbOalOi F0WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ebrbdevgi6FUEgGptFpxVEWU1y5LoDhpQCpoVTGFgpI=; b=l5Un+JwOsVKq+ryKiODmo1Pz1Ytd1hltg40KjgN0VOOJFdUcqOcO1d8bcfRAE3SvHX 4CDgFdeLgNqQUXEde9hqmorw1J5yBAnRsO4hYFAlVxnxu26ABHwvR/iWw8y6LEu0bHs+ ne3JO21H7SfbpUWJOualXg9id7aLW2tBlHTH+A3++R6wZiRKnEL2g8aDqNR2uiCx5Q2k XCwZHruXJoUO8oMWGs0dH/lGIetkezfJVWDMFGjJF43vIpqZo0MH4Zr2gf1oirgu4HQI MTluvOEbfTxUNZ9ZMnC1N6Ve35Zk5bjxc/+zbQElA6iC3TJbJJW6EahV2vs+KcyMIbiz VXrQ== X-Gm-Message-State: AOAM532DwKisREy1xt2/UrXoW3kiX7CoyHx22jdFGYEfVOcmF6EhB48e dvCH6VmaUjM9oNiwExSRNsM= X-Google-Smtp-Source: ABdhPJy0jDZ/zVvduDcp9a1AxIP7XAFKOmnv+DVoCdvpr9feTsPwKmR4vpLfIf2wDkQ/Y6MYsq03iw== X-Received: by 2002:a1c:7f8b:: with SMTP id a133mr3779131wmd.155.1601478488825; Wed, 30 Sep 2020 08:08:08 -0700 (PDT) Received: from localhost.localdomain ([84.40.93.108]) by smtp.gmail.com with ESMTPSA id k4sm3613486wrx.51.2020.09.30.08.08.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 08:08:08 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 2/3] kernel-shark: Check if Qt has been found when building the examples Date: Wed, 30 Sep 2020 18:07:40 +0300 Message-Id: <20200930150741.224779-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930150741.224779-1-y.karadz@gmail.com> References: <20200930150741.224779-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Some of the examples depend on Qt. Check is Qt exists befor trying to build these examples. Signed-off-by: Yordan Karadzhov (VMware) --- examples/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 35e6b1e..032f305 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -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) From patchwork Wed Sep 30 15:07:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11809349 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C8BB92C for ; Wed, 30 Sep 2020 15:08:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E29712158C for ; Wed, 30 Sep 2020 15:08:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BsJYkKKF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728965AbgI3PIM (ORCPT ); Wed, 30 Sep 2020 11:08:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728425AbgI3PIL (ORCPT ); Wed, 30 Sep 2020 11:08:11 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88BDEC0613D0 for ; Wed, 30 Sep 2020 08:08:11 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id e2so2172124wme.1 for ; Wed, 30 Sep 2020 08:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uYb2qQ/Gph+j6YD4dlLENswYbanXRiluH5G23HU+5Mg=; b=BsJYkKKFq8/XOXNamP7Y0e53HiCfO10EIUyTAts72VFC3Dnb4saXFQNIHGJ25fNwA5 eDvQ9nbCl4q+KcrMkYPavs7L3dId6UQ7DurHs05eyw5Uh0eMwCu3Mgh5s31vNjqcjDaP 9Pjyk+ZX7exvaXGlAGuQ8VQkCTzBnDXqqN7lD89COh+2a0nBF+RDniTslGdxIUjWOuUa kGkSyj/qvWQGbUjH73AQTr81T2E0MP6IH+EUrhjzDnWG7vXIDksrJl+yDjwc4XLqL2rJ +uHNSqdr4qtoWdzPC+ufqKcfS/oA1giG9RLnfTTbxWIY4NmB2Fb8eacjb1q1731kMoga Sl7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uYb2qQ/Gph+j6YD4dlLENswYbanXRiluH5G23HU+5Mg=; b=MxVu92hrHcDO9TwxjeRO437mLlxZx6rVPNwuUB706L2NnUhRoBwcStWYra/4iQQZW4 +ZqhaVeqAt3EY2JCmzuqfiDhOT4FQgxvA+nYKUhkb2+Vojn1wgppiQfyOiBaoE1fQMU7 dgOFGV2bkLWNbLw/BnHTyVQ4JkaQSZhjcMTOfVARbjTW9jCEyMTGjvYcDn5eddd3B9Q5 VIAsn2OS3Y1EYuX5AnYwQVfJDe1rWQ29uS9l8ZqmM/QQIj/ks+oMDmCo19RAKpFT+ziP zPceYImgNAX5Bt3AXCBOU+nsTHzT2jLjH8YclR0KNoYBBKU28M2IWKTgTTmu/pBDBapv bZ/A== X-Gm-Message-State: AOAM533VmTahQeVVEu372qj/J7rfJqXdAGfJ9CE1SZZC/WmAwFdw8g6P SDIhVqz/fiGEjlt6neX1nZ0crA1Lyqs= X-Google-Smtp-Source: ABdhPJyCHOxXf1P0vQf0Soobp5yetVwOkBaCRXxnYsB19AGcl0qrP3tZiti7Htva8TWlqBX3mJABMQ== X-Received: by 2002:a1c:a987:: with SMTP id s129mr3453315wme.38.1601478490295; Wed, 30 Sep 2020 08:08:10 -0700 (PDT) Received: from localhost.localdomain ([84.40.93.108]) by smtp.gmail.com with ESMTPSA id k4sm3613486wrx.51.2020.09.30.08.08.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 08:08:09 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 3/3] kernel-shark: Fix symbol resolving during linking Date: Wed, 30 Sep 2020 18:07:41 +0300 Message-Id: <20200930150741.224779-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200930150741.224779-1-y.karadz@gmail.com> References: <20200930150741.224779-1-y.karadz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org 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) --- src/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9666b18..457c100 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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}")