From patchwork Fri Sep 20 10:48:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11154223 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 27263912 for ; Fri, 20 Sep 2019 10:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 047F5208C0 for ; Fri, 20 Sep 2019 10:48:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Q6VTSELn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408704AbfITKsl (ORCPT ); Fri, 20 Sep 2019 06:48:41 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54963 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408702AbfITKsl (ORCPT ); Fri, 20 Sep 2019 06:48:41 -0400 Received: by mail-wm1-f68.google.com with SMTP id p7so1928173wmp.4 for ; Fri, 20 Sep 2019 03:48:38 -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=Z4kc1j7WPaNizPMBT7tjDLvWgc64zJOz/Y5IipybVpo=; b=Q6VTSELnh6IpMA/VXFfFqTwHd5dJ1SeCJEN1l7fqjwcCPX9c18XPTEMGgI0CZbi+xW br+/pNV4vOJOQyZbSocMdvCQzuk9/RCbpUu2SgMBxQTFvM+BAAgH/6axzE8ZqB9EYiD/ WUegLXc60zNEIq4SPj7JPwQFXkFhu1NefcAzvPk3sT/jiDWi670r9VGbeDSnu1odRqcI U3iojpsLGmV8YDImIsXIbo1kXKoRX8iYk2YksU2LD7oDjHgukF+5P+d2GHyEMyj3oHxo RvfC7bsNAN67339CTndV/6ApZD24RVaRpjfHQJlVeQCb1TDkc1gJk6xVb5TWmRs0CFRb Q+nw== 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=Z4kc1j7WPaNizPMBT7tjDLvWgc64zJOz/Y5IipybVpo=; b=gWFWHCNzDkpYsbCOhU/0HZ2rNbg9tFEQBzaoHGSF079d9Bu0doefyrB8Cs00jnNQcC gNE/YqLhFuD8KNfwc1s967M4UNN4hG3MACZRJ++FBGWGOGbeyoaKQttuVZhDJR1gchjo MUHFdnF0GcZIhNFbeDpN2bfjz+XeSrLXZ3qnFrEA8Hq04fc7bO8sPAado4TpZG3C/fW/ H4y9aqsV/xUpQ3/TF6a8ypXhOA0FmRIVGBIDynpA0bc9p9uRXzz/wyUzW1xcRuVZSySL Uzutym0JP5NHZ7GxAt4p0f6mfnDYtmJG61kdJjfaI4cPnKXG8/Ka+c2ELVj9uzgjZjPR erbg== X-Gm-Message-State: APjAAAUBC1aLqJvro6Kt6D7k8EwAPHT8rTEuD5Oggi6xWsXW+fUCqgrd 5rMVf1B9jriWWYFqK1iY16A= X-Google-Smtp-Source: APXvYqyDvrfuWukcSWPWb6YQhYeFTvfsj+z6/rivDrJ10qW5NiaIsuPEWvPR3vKgwZYDLIwujSdAlQ== X-Received: by 2002:a1c:1d84:: with SMTP id d126mr2988394wmd.58.1568976518236; Fri, 20 Sep 2019 03:48:38 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id t14sm1641978wrs.6.2019.09.20.03.48.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 03:48:37 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 1/4] kernel-shark: Use correct order when linking all depenancies Date: Fri, 20 Sep 2019 13:48:28 +0300 Message-Id: <20190920104831.23475-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190920104831.23475-1-y.karadz@gmail.com> References: <20190920104831.23475-1-y.karadz@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org I wasn't aware of the importance of the order in which the libraries are passed to the linker, so in the dependency list in src/CMakeLists.txt I naively started with the most basic libraries first. This is WRONG. The linker searches and resolves symbols in the order that they appear. If library A contains a call to a function from library B, we have to put A before B, otherwise the linker won't know that something in B needs to be resolved. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt index 21494cc..e20a030 100644 --- a/kernel-shark/src/CMakeLists.txt +++ b/kernel-shark/src/CMakeLists.txt @@ -7,10 +7,10 @@ add_library(kshark SHARED libkshark.c libkshark-configio.c libkshark-collection.c) -target_link_libraries(kshark ${CMAKE_DL_LIBS} +target_link_libraries(kshark ${TRACEEVENT_LIBRARY} + ${TRACECMD_LIBRARY} ${JSONC_LIBRARY} - ${TRACEEVENT_LIBRARY} - ${TRACECMD_LIBRARY}) + ${CMAKE_DL_LIBS}) set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") @@ -23,8 +23,8 @@ if (OPENGL_FOUND AND GLUT_FOUND) KsPlotTools.cpp) target_link_libraries(kshark-plot kshark - ${OPENGL_LIBRARIES} - ${GLUT_LIBRARY}) + ${GLUT_LIBRARY} + ${OPENGL_LIBRARIES}) set_target_properties(kshark-plot PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") @@ -65,11 +65,11 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) KsAdvFilteringDialog.cpp) target_link_libraries(kshark-gui kshark-plot - ${CMAKE_DL_LIBS} + Qt5::Widgets + Qt5::Network ${TRACEEVENT_LIBRARY} ${TRACECMD_LIBRARY} - Qt5::Widgets - Qt5::Network) + ${CMAKE_DL_LIBS}) set_target_properties(kshark-gui PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") From patchwork Fri Sep 20 10:48:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11154225 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 60983195A for ; Fri, 20 Sep 2019 10:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CE65207FC for ; Fri, 20 Sep 2019 10:48:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="irEaqOCz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408702AbfITKsm (ORCPT ); Fri, 20 Sep 2019 06:48:42 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:54962 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408703AbfITKsl (ORCPT ); Fri, 20 Sep 2019 06:48:41 -0400 Received: by mail-wm1-f65.google.com with SMTP id p7so1928238wmp.4 for ; Fri, 20 Sep 2019 03:48:40 -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=x50sgX+AOCc0TaNi8TeHSnv6RAAO75E2B/Z9yeqSR9I=; b=irEaqOCz3TVzVEgKM6PWuWOlI+8n1dTPa4w08dOaXjrzFIb1bqhztpK5qDY+IY070U jWyaZg/NmuEq/ZOn5uQIyEb1yDu1r66mmzsZS3nfPeso/2Qb0n74WSIq/H4OxEjklWSU rOctsus3QAMbbzvvCJ1Qed/IyXjW3IMDrmFNg1XuxOqJKvKoOUWhS/F1QsPydNHnsPh1 cU+aOQb4g4DUT/4HVZg1iQzY4j55RPtNZOSvOk9MSwFuaefqrUZ+n2CmES5akZQWLXwf tZiCpcv2D7rttJt1/NECzkaoqv0XnY52KjmlyvvetrxRyrAOXs9J9dSBcwzxO2H9Z1OY R7WQ== 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=x50sgX+AOCc0TaNi8TeHSnv6RAAO75E2B/Z9yeqSR9I=; b=ArzqXHUvMXDEIMRFqZyHW2Rz5anDcMAPIFwHIkDunYtLKXAQANvmZasq5IppVv14Wr Tvx5gUJV2eRVSkrPLFZEKF9RlcFM20rXINh5oSwfzrxVX+mK3Bq8N4jJQ7YKXUoyW6VX o0PefweMrHWLs8tIbfKI075EYs6FPxgQ7Uw9xlTyPzAgyRHo9/j3HSmuMtSxJroRERm0 9B2l+EDoTfDG0v07ud9D715NBpgHbEOPOBjf9vMGz8aM7Q/9jbJkLfD1SoPR2hOfkh/n fvdF9UOCWHDOQH4DNAAzWE1UvfR6YFDPOe59k65c5NepibNEk7Ed37tVGzroty+aV2GL O3VA== X-Gm-Message-State: APjAAAX9P3mJV3QmMq///6zzb9+Kf4GYhepZrKuiiZ2opJdo2lRSvOWh yBwV7z5h0b82rL2Y8ElNwsSw7+BX X-Google-Smtp-Source: APXvYqyAr4FAD9TF6SHzsoMG8pio0v3UpTkJNhHUDXKn15QaoIxIXp4z10Ez0Yw0pvdu70mbj6cFyg== X-Received: by 2002:a7b:c10b:: with SMTP id w11mr2893049wmi.108.1568976519742; Fri, 20 Sep 2019 03:48:39 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id t14sm1641978wrs.6.2019.09.20.03.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 03:48:39 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 2/4] trace-cmd: Correct the install paths of traceevent and trace-cmd libraries Date: Fri, 20 Sep 2019 13:48:29 +0300 Message-Id: <20190920104831.23475-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190920104831.23475-1-y.karadz@gmail.com> References: <20190920104831.23475-1-y.karadz@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In order to be able to use the installed versions of the library's headers (and the libraries itself) the directories structure of the source has to be reprodused in the install location. This modification is needed by the NumPy interface of KernelShark. Signed-off-by: Yordan Karadzhov (VMware) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index dabdf8d..7124b2f 100644 --- a/Makefile +++ b/Makefile @@ -344,12 +344,12 @@ install_gui: install_cmd gui $(Q)$(MAKE) $(S) -C $(kshark-dir)/build install install_libs: libs - $(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)) - $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)) + $(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd) + $(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent) $(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent) $(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent) - $(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)) - $(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ)) + $(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ)/trace-cmd) + $(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ)/trace-cmd) doc: $(MAKE) -C $(src)/Documentation all From patchwork Fri Sep 20 10:48:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11154227 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 0E74517E6 for ; Fri, 20 Sep 2019 10:48:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1F2D208C3 for ; Fri, 20 Sep 2019 10:48:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oac0dJtq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408706AbfITKsn (ORCPT ); Fri, 20 Sep 2019 06:48:43 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:33216 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408703AbfITKsn (ORCPT ); Fri, 20 Sep 2019 06:48:43 -0400 Received: by mail-wm1-f66.google.com with SMTP id r17so9250988wme.0 for ; Fri, 20 Sep 2019 03:48:42 -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=6FFwUsxoFzc+hY7PxaoFIpi3ees7WEwo0cj++kWpZQc=; b=oac0dJtqGmCfP57ae6KbknbclHUw1a/AcHTYaeRbG4rWklbf68eXeFsm8Ut6eT6QtQ 89OkxStfHWpGD0I9DNNGU5S4lsfe2dzWpqzR6jMiEUOvGVBKUhNmQsUxLilZpGTjfxoZ cCwIo3Zl8fLPusSxYyfKxhNFQvxjQH1sUHEuBan0N+UK1ij6w7sc66BER23JaLIY+nmU Nb6i3OcGjbS1yF1UQgf9RPl2S9HxVSxTBMbRIuKuGu2HAcmX7US0wmgfRPYnSoMneBzC Q1t9Zu75RAOfns7lrvAuUW/ykeIzecEg2a3zBkxbQnhMstTZ0wYWRITFR0551MPkX8BF 4MUQ== 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=6FFwUsxoFzc+hY7PxaoFIpi3ees7WEwo0cj++kWpZQc=; b=OhZXgUu9Q+nF1Mubae583DiTG7iPyYnyklkBN8d16Jj9Ok4jxkbv6yzmI7TgT3BylC 58WrIdnFiXY66Ne2JwDMCabf6pZ9p9SBQpwUI/j/i3oGExkGpc8rdM3NgaCxo6pn9f8K luUimIjRejVDFwu/K0I5e4pAtCLIkDuJbALgTo8WvWtky2Yuy2DoIMekNEDaYJ9CvouD VdHeX2FLQ6Xd7RbUN7rfycxnGucIJvvH/llqZWRbm9swmgXHJVKO+4Cu42GPBDynkF1E NZi4I/0FTcaK0ONjFy4AnedRCqI5BTt+xLIdP4jAon3rZnXFNe9XdlB9tQECJW/s72Uq BhFw== X-Gm-Message-State: APjAAAWAhetWh/g+PGfkPuXsH2N/EX8ggcVa99eOX01uCz57M0oYtjgI 64LRcpee71d2LURSjFh2PZS9ZoTh X-Google-Smtp-Source: APXvYqwSXNylNonOqoRlzAcTtFsIbGlBvPhuqya/i/MLwNctgaCXi3hGv8Bte8h9ur5e8PMiqD4G0g== X-Received: by 2002:a1c:61d6:: with SMTP id v205mr1755798wmb.35.1568976521543; Fri, 20 Sep 2019 03:48:41 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id t14sm1641978wrs.6.2019.09.20.03.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 03:48:41 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 3/4] kernel-shark: Fix the file paths used by Doxygen Date: Fri, 20 Sep 2019 13:48:30 +0300 Message-Id: <20190920104831.23475-4-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190920104831.23475-1-y.karadz@gmail.com> References: <20190920104831.23475-1-y.karadz@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The Doxygen documentation, including its configuration file, have been moved to another directory. Therefore the paths, used by Doxygen to find its input, have to be changed accordingly. Signed-off-by: Yordan Karadzhov (VMware) Fixes: d4d68c9 (kernel-shark: Separate trace-cmd and kernelshark) --- kernel-shark/Documentation/doxygen/dox_config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel-shark/Documentation/doxygen/dox_config b/kernel-shark/Documentation/doxygen/dox_config index 43c7f84..89b9284 100644 --- a/kernel-shark/Documentation/doxygen/dox_config +++ b/kernel-shark/Documentation/doxygen/dox_config @@ -4,7 +4,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "KernelShark" PROJECT_BRIEF = "Kernel Shark is a front-end reader of the Linux kernel tracing data." -INPUT = ../src/ ../src/plugins/ +INPUT = ../../src/ ../../src/plugins/ SOURCE_BROWSER = YES QT_AUTOBRIEF = YES TAB_SIZE = 8 @@ -13,4 +13,4 @@ CASE_SENSE_NAMES = YES SORT_MEMBER_DOCS = NO STRICT_PROTO_MATCHING = YES DOT_MULTI_TARGETS = YES -PROJECT_LOGO = ../icons/KS_logo_stacked.svg +PROJECT_LOGO = ../../icons/KS_logo_stacked.svg From patchwork Fri Sep 20 10:48:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11154229 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 67CC8195A for ; Fri, 20 Sep 2019 10:48:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44718207FC for ; Fri, 20 Sep 2019 10:48:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="o7Ni0aQs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408703AbfITKsp (ORCPT ); Fri, 20 Sep 2019 06:48:45 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45374 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2408705AbfITKso (ORCPT ); Fri, 20 Sep 2019 06:48:44 -0400 Received: by mail-wr1-f68.google.com with SMTP id r5so6220989wrm.12 for ; Fri, 20 Sep 2019 03:48:43 -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=bmieVqoAI4vnXNAnQZ/eFO/Jqd9blps4NInRwrQZ9KA=; b=o7Ni0aQseCTv2BTCZyUOyg5OSodajbmygiKqZdJd607u98pKQ2YSSeQtVOM8PJh6Kd V8qZvuDFH/W23eVOCH44uMDFkrpnLAy6iunZhKGzs33cTAxgY4XOcv+tby2GK5yovuy4 tvXtv5gb7CVLjd3KK9VgaK/olYJj6eiH+7OVAbkv2SoeqrDxcMVoC0cN6wF+Q+4lWiQD QEJef8rVBxQTyxkErej+BtvZExFPALF8FIXdDg/22++4fxiNRBZ40zIZsllWSIMiEPhT cv64GWB6Esqd06oQxMYCKZ7XJupoiQQRf4DDDgCikjmdCEHhnn+bc1SkuMbTer6Xb0s+ YlXA== 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=bmieVqoAI4vnXNAnQZ/eFO/Jqd9blps4NInRwrQZ9KA=; b=AtIY+flWH3RBUHsuz55HEBdXX/wKNa9fGs/RydGiI8eFq/Y6iBBirkm0UpoPu0V4Uv py5E0cAYGLYLlboIe9nPs604fUCwqkDVOUVyf6H6iL7glLNgji6zC7fACT/AxI8NSl23 Br7Wc6tt7k+VDJRrlwn9W/xz6WAE7aV6FU6YENosGjmcQXQG+NleC9MFK9rw7jcU3uym BBL4qC7dh/Wmil1V0+aT9SRWeSdBAKFC2ZNOILpdWk5X063AQCpFDdIk3B9/70FsJvKL Lo+VcLIAb1oGd7PnF+JVK+w1L2tOBN+ubfgkP7btbcfHa/HIso7Cz9lEkel4qHXU/Nsx uGlQ== X-Gm-Message-State: APjAAAV3TCa2Nxggdgo/G5vRE8HsyV5JFL0uR+3AxBcF1T9IqCEsJhTa 8Z6IhZOX/dxFtbB6shjmOzY= X-Google-Smtp-Source: APXvYqz9xYqK4sUbxhghHFnPnDuzr9yEbfFUSOzXaH3zUQ0slcDxSOhsbVS8X/fMQfGh3A4RUAbbuQ== X-Received: by 2002:a5d:4350:: with SMTP id u16mr10835649wrr.289.1568976522992; Fri, 20 Sep 2019 03:48:42 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id t14sm1641978wrs.6.2019.09.20.03.48.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Sep 2019 03:48:42 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 4/4] kernel-shark: Cleanup in KsCaptureDialog Date: Fri, 20 Sep 2019 13:48:31 +0300 Message-Id: <20190920104831.23475-5-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190920104831.23475-1-y.karadz@gmail.com> References: <20190920104831.23475-1-y.karadz@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org My original intend was to fix a Doxygen warning complaining about a data member of a class not being documented. However, when I tried to write explanation for this data member (KsCaptureMonitor::_captureStatus), I realized that it is completely useless and that it actually violates the encapsulation principle, since it holds the return status of the capture process, but the capture process itself is owned by another class (KsCaptureDialog). Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsCaptureDialog.cpp | 21 +++++++++++---------- kernel-shark/src/KsCaptureDialog.hpp | 2 -- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp index fff42aa..ad05917 100644 --- a/kernel-shark/src/KsCaptureDialog.cpp +++ b/kernel-shark/src/KsCaptureDialog.cpp @@ -385,7 +385,6 @@ KsCaptureMonitor::KsCaptureMonitor(QWidget *parent) : QWidget(parent), _mergedChannels(false), _argsModified(false), - _captureStatus(false), _panel(this), _name("Output display", this), _space("max size ", this), @@ -523,9 +522,6 @@ void KsCaptureMonitor::_captureFinished(int exit, QProcess::ExitStatus status) _consolOutput.appendPlainText(errMessage); QCoreApplication::processEvents(); - _captureStatus = false; - } else { - _captureStatus = true; } } @@ -585,6 +581,17 @@ void KsCaptureDialog::_capture() _captureProc.start(); _captureProc.waitForFinished(); + /* Reset the _argsModified flag. */ + _captureMon._argsModified = false; + + if (_captureProc.exitCode() != 0 || + _captureProc.exitStatus() != QProcess::NormalExit) + return; + + /* + * Capture finished successfully. Open the produced tracing data file + * in KernelShark. + */ argc = argv.count(); for (int i = 0; i < argc; ++i) { if (argv[i] == "-o") { @@ -592,9 +599,6 @@ void KsCaptureDialog::_capture() break; } } - - /* Reset the _argsModified flag. */ - _captureMon._argsModified = false; } void KsCaptureDialog::_setChannelMode(int state) @@ -610,9 +614,6 @@ void KsCaptureDialog::_sendOpenReq(const QString &fileName) { QLocalSocket *socket; - if (!_captureMon._captureStatus) - return; - socket = new QLocalSocket(this); socket->connectToServer("KSCapture", QIODevice::WriteOnly); if (socket->waitForConnected()) { diff --git a/kernel-shark/src/KsCaptureDialog.hpp b/kernel-shark/src/KsCaptureDialog.hpp index 612080c..3fd3d8d 100644 --- a/kernel-shark/src/KsCaptureDialog.hpp +++ b/kernel-shark/src/KsCaptureDialog.hpp @@ -141,8 +141,6 @@ public: */ bool _argsModified; - bool _captureStatus; - private: QVBoxLayout _layout;