From patchwork Fri Jul 5 14:10: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: 11032703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C78C7912 for ; Fri, 5 Jul 2019 14:11:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B624528A45 for ; Fri, 5 Jul 2019 14:11:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA73828A4C; Fri, 5 Jul 2019 14:11:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D51628A45 for ; Fri, 5 Jul 2019 14:11:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727783AbfGEOLH (ORCPT ); Fri, 5 Jul 2019 10:11:07 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51477 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbfGEOLH (ORCPT ); Fri, 5 Jul 2019 10:11:07 -0400 Received: by mail-wm1-f65.google.com with SMTP id 207so9026157wma.1 for ; Fri, 05 Jul 2019 07:11:06 -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=YES+gq8/faaNeT0qDLicw5Zrqz5fEZVeWY10rDhUJJU=; b=kfqqqEdzYzcsKenJ9NlxahUYSqdjtDYogKhK+jyRFU/OOdvfOBxYg+0QqDwCSgM/5A DrqWgBxXdWP38QaBrTwWe/qb6EgqLJ7xwCj6ocWWsFgyQ7b054po/zhx2EDvNq9Y53Jj KpZfc4vntn18ucGk5VBPoeOE16Pj1rgXKYMyWMTB8lE6P2JWH2mONbLJ6fssUn1ynHGQ pg+w1P2wTuASg6Y0CCdcsA6SiuU+ot/9xYrMKkYqukwzBr6Vsu4uvqZlp9fzx1dWm7M4 8ehC8uzOlbTv0yMovOdW4qRKfUISviEPwRRtCK76ngxrWMbnYU46Oz9OEFsWZRjzbqrN Tuiw== 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=YES+gq8/faaNeT0qDLicw5Zrqz5fEZVeWY10rDhUJJU=; b=DrKfeOnX8LiOaAiM+Y03a80BJLREwyFJa9qTVTDzdp9j3mU2uhNy2aaY5KSqAk54Q1 jozcud5s3AiK2h8c0kDKcW9ubMtPGwV2iakurH8aiXZuBhlA2juAHxNZi4jauWIyH6YJ JtUOw1VvhumeUySAOEVqSKl+4lXXwu6KKlujUXhDt1rNa8A/IURRUNjH+VhKd4Jd65Eb OqpHf2yyLcRo3tPQwE3e+ZDosC9FMzeoQQ0TqrfBU2X+kNL032TmvWuy6+ImgDIT53T8 AO1EvW6EtcdxF6CJisPw/WvmujNZluXAoxuSbcIVuCYrQMH27HlTUB0mxTPL1vGEl0/k MWYg== X-Gm-Message-State: APjAAAUm9zBIxR5v1UXcpoKH08A6MKtHeyyxsf/B1M+doW7aQt3AbBOQ pgQvB9xZfnaN256HSQS8dp8= X-Google-Smtp-Source: APXvYqw+Vbzb4Bocj7iap9I3FeIL96KUv8ga5rg7KX/gyRv3+RkEQ/FBnPfzfns/Q+w6V9ZH9y7Aqg== X-Received: by 2002:a1c:cfc5:: with SMTP id f188mr3450576wmg.24.1562335866300; Fri, 05 Jul 2019 07:11:06 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id f192sm1893715wmg.30.2019.07.05.07.11.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 05 Jul 2019 07:11:06 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 1/2] kernel-shark: Line up the table of the loaded Advanced filters Date: Fri, 5 Jul 2019 17:10:30 +0300 Message-Id: <20190705141031.20239-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190705141031.20239-1-y.karadz@gmail.com> References: <20190705141031.20239-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 X-Virus-Scanned: ClamAV using ClamSMTP The Advanced filtering dialog shows a table of the already loaded filters. The new line that is added at the end of the string breaks the alignment of the last column of this tables. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsAdvFilteringDialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel-shark/src/KsAdvFilteringDialog.cpp b/kernel-shark/src/KsAdvFilteringDialog.cpp index 1edf68b..6af1aea 100644 --- a/kernel-shark/src/KsAdvFilteringDialog.cpp +++ b/kernel-shark/src/KsAdvFilteringDialog.cpp @@ -216,7 +216,7 @@ void KsAdvFilteringDialog::_getFilters(struct kshark_context *kshark_ctx) continue; _filters.insert(events[i]->id, - QString("%1/%2:%3\n").arg(events[i]->system, + QString("%1/%2:%3").arg(events[i]->system, events[i]->name, str)); free(str); From patchwork Fri Jul 5 14:10: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: 11032705 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D70AB912 for ; Fri, 5 Jul 2019 14:11:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C77D428A45 for ; Fri, 5 Jul 2019 14:11:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBD7928A4C; Fri, 5 Jul 2019 14:11:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69A0B28A45 for ; Fri, 5 Jul 2019 14:11:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725497AbfGEOLL (ORCPT ); Fri, 5 Jul 2019 10:11:11 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:34507 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbfGEOLL (ORCPT ); Fri, 5 Jul 2019 10:11:11 -0400 Received: by mail-wm1-f67.google.com with SMTP id w9so7580100wmd.1 for ; Fri, 05 Jul 2019 07:11:09 -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=x2mbc7l1bVE9UmAOYo5p0EBGdm4NiN+7zexATRy6YZw=; b=IldIsKjJE1w/3xHqQdwmOhn6mhBzzUcfbBMFd9qUdvICJFKHlep/46Wn7JZwsekbac 1QQXny45xRIdwjvxQBjKFKcp8BJEvyCnNjuSp3alc7Pt8KWVJ5mgSx9ZBlwKnUFKnhnH Itl6NiIDTOpmneGrjTBLzrT22hda3Mh+r8Nr3G3DuEV4wbufnhYJexO2zhdOJ+3BtYcZ uvg+k6Xw2tAGnKzo6B3dPPFeqkiiP4iSZg2cYz3kFIQGLwZ0lq+tFbTaCzt7RwoYCaAU Xdj1a4ngjsGPbaqiHR6t6Pd/uCguboDLF90h+I7NuQlS7OFNioDKg7E0GNEFYaEpkmIn p4Hg== 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=x2mbc7l1bVE9UmAOYo5p0EBGdm4NiN+7zexATRy6YZw=; b=GwVBYFNZxwr78hjcCllYpwkKq9R1gYXG7iThB6D7zZjhhWrRiZ15LFxxyB967Nrwte S/4uYgPXIaVtbj9hXDurmfY7GconkZ1u3u1imEAXgtqJ2mfTHm+n/0nKPS27FnteF2gH Y4SW16LoXq8rgDswvOojzx3rCNMB4EIN/vrINaJ78HTqlBST1WHV06s9bWUyJ6fmVCxe lLGhnutwBPcwnL2gKTib/UvZR+GSAnJYr/U9YKZNFQslZKV4Olpr8CCX4UG6X2kmPimH pcrI44bORVLF11mpf0g6vU0Xa4ngQBpXTf6ZPGjDCsi3t6PL/X0jqDf/o5GkvwByIQ4y EUVQ== X-Gm-Message-State: APjAAAWQmGeLs1sxBQ/llUiY5Yxwy8lf2oCqLawHVcHJUsgxpsOPs/J/ YkbZcqRKf8N+KyPGQQxpNS0= X-Google-Smtp-Source: APXvYqyd8umtKRYYU18CRIdWqhcMVI6DvXyzpXx35KAlYbuMNVdfK3133+v+TN8E5H7UznrJIVdJqA== X-Received: by 2002:a7b:c748:: with SMTP id w8mr3562470wmk.36.1562335869072; Fri, 05 Jul 2019 07:11:09 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id f192sm1893715wmg.30.2019.07.05.07.11.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 05 Jul 2019 07:11:08 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" Subject: [PATCH 2/2] kernel-shark: Separate the target instalation instructions Date: Fri, 5 Jul 2019 17:10:31 +0300 Message-Id: <20190705141031.20239-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190705141031.20239-1-y.karadz@gmail.com> References: <20190705141031.20239-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 X-Virus-Scanned: ClamAV using ClamSMTP Having all target installation destinations given in one instruction may result in an error in the case when some of the third-party dependencies are missing. This will happen because you are trying to install a target that hasn't been built. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt index 6cbc00f..1228993 100644 --- a/kernel-shark/src/CMakeLists.txt +++ b/kernel-shark/src/CMakeLists.txt @@ -14,6 +14,8 @@ target_link_libraries(kshark ${CMAKE_DL_LIBS} set_target_properties(kshark PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") +install(TARGETS kshark LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}) + if (OPENGL_FOUND AND GLUT_FOUND) message(STATUS "libkshark-plot") @@ -26,6 +28,8 @@ if (OPENGL_FOUND AND GLUT_FOUND) set_target_properties(kshark-plot PROPERTIES SUFFIX ".so.${KS_VERSION_STRING}") + install(TARGETS kshark-plot LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}) + endif (OPENGL_FOUND AND GLUT_FOUND) if (Qt5Widgets_FOUND AND Qt5Network_FOUND) @@ -77,7 +81,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) add_executable(kshark-record kshark-record.cpp) target_link_libraries(kshark-record kshark-gui) - install(TARGETS ${KS_APP_NAME} kshark-record kshark kshark-plot kshark-gui + install(TARGETS ${KS_APP_NAME} kshark-record kshark-gui RUNTIME DESTINATION ${_INSTALL_PREFIX}/bin/ LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/)