From patchwork Mon Aug 26 15:58:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11114981 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 65E0E16B1 for ; Mon, 26 Aug 2019 15:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43D2A21848 for ; Mon, 26 Aug 2019 15:58:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DGzeYuQa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731513AbfHZP6i (ORCPT ); Mon, 26 Aug 2019 11:58:38 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39673 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727864AbfHZP6h (ORCPT ); Mon, 26 Aug 2019 11:58:37 -0400 Received: by mail-wr1-f66.google.com with SMTP id t16so15853735wra.6 for ; Mon, 26 Aug 2019 08:58:36 -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=pbdhstZEdbfMh7PZnm9j1QeONGkXSdkZbPuAkuj3VZ0=; b=DGzeYuQaU4aRCxNv2ntu1zq0M2CL4B3RhSfwGmo6BwxAejB/ljuZHrAlL5a4SHt0Rv jSHD7zoa6iqE5zjQM0DIFc8Dgu4475dL92cK6iSZ4V7ux2qBdHKmWzZ94EFC/aBS5Eh9 9qfGg2xK/O11fV7W7Zs0G8IR1zpAtfL1f4McYEnVNWmvGdiuKlL3QIdjvN5jE6TZ+AlV R5MikknTFOx8oXwTpiKq99utGeQHs9KzbYIsRkib7eUAFxrcMZUSUugtD3xCYBhXDGGB 3LCUNKBuuA6qg4/skJvb6q4eXyAwahVojsfJ/el8jxM+LVio4LyCYyHIXOMPbxVmSNYt MJaw== 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=pbdhstZEdbfMh7PZnm9j1QeONGkXSdkZbPuAkuj3VZ0=; b=Th/H1F5JAaIgDZ+9J1aYKkCz7AIanoqwZzIYjehvK+DvOPzZ+IWfoqT779B6TJfjbQ zLcCpvGgY8Y9GnKZPb79bracbI7hWaoPRTz5zc9qu1wA8dwprzvBqhqqr2mPI2uJhj/C dEH5Cy6HCbhy6KtAaMmQ8l3XY3L1tW+8tSkkKrBx5vsJ9cGeH8Ic8f1nDzD43mwoBS1A YOjFG4evj5o5zi8spk1WM6h5+SFpbbYhgXLq8u7lEy5zqCEr46Ss9V9QkmEtk+nfcVWg bU/cnz+MUtBkW/OgSWBnxImaJEjxCRaYNzQpnRXpOjklZe5rodIxpIJH9HkCzRqNTHsN sOGg== X-Gm-Message-State: APjAAAUfrHgpB15hHUMjQ/62HuJlzj04fisNJ6p9aN1XS2GQEiWv7MRe cDiBioJ+M75K0AsQjIPukS8= X-Google-Smtp-Source: APXvYqxkNspiiW8f83UITwmmM8tJAQil74fHRufslCbF1VhChk+S/DtvXJdAYBPtfXtaqkEDeusW3w== X-Received: by 2002:adf:ec4f:: with SMTP id w15mr23341532wrn.311.1566835115682; Mon, 26 Aug 2019 08:58:35 -0700 (PDT) Received: from localhost.localdomain ([84.40.85.140]) by smtp.gmail.com with ESMTPSA id p13sm14447458wrw.90.2019.08.26.08.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 08:58:35 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, mike.auty@gmail.com, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 1/5] kernel-shark: Show warning message when running as Root Date: Mon, 26 Aug 2019 18:58:07 +0300 Message-Id: <20190826155811.32021-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190826155811.32021-1-y.karadz@gmail.com> References: <20190826155811.32021-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 Running the KernelShark GUI with Root privileges is not recommended due to security reasons. The user will be allowed to continue on its own risk. Suggested-by: Steven Rostedt (VMware) Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204475 Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsMainWindow.cpp | 28 ++++++++++++++++++++++++++++ kernel-shark/src/KsMainWindow.hpp | 2 ++ 2 files changed, 30 insertions(+) diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index 6439265..2f86517 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp @@ -76,6 +76,9 @@ KsMainWindow::KsMainWindow(QWidget *parent) _createMenus(); _initCapture(); + if (geteuid() == 0) + _rootWarning(); + _splitter.addWidget(&_graph); _splitter.addWidget(&_view); setCentralWidget(&_splitter); @@ -1271,3 +1274,28 @@ void KsMainWindow::_deselectB() _mState.updateLabels(); _graph.glPtr()->model()->update(); } + +void KsMainWindow::_rootWarning() +{ + QString cbFlag("noRootWarn"); + + if (_settings.value(cbFlag).toBool()) + return; + + QMessageBox warn; + warn.setText("KernelShark will have Root privileges."); + warn.setInformativeText("Continue on your own risk."); + warn.setIcon(QMessageBox::Warning); + warn.setStandardButtons(QMessageBox::Close); + + QCheckBox cb("Don't show this message again."); + + auto lamCbChec = [&] (int state) { + if (state) + _settings.setValue(cbFlag, true); + }; + + connect(&cb, &QCheckBox::stateChanged, lamCbChec); + warn.setCheckBox(&cb); + warn.exec(); +} diff --git a/kernel-shark/src/KsMainWindow.hpp b/kernel-shark/src/KsMainWindow.hpp index 62e66a0..4a7b8ab 100644 --- a/kernel-shark/src/KsMainWindow.hpp +++ b/kernel-shark/src/KsMainWindow.hpp @@ -238,6 +238,8 @@ private: void _deselectB(); + void _rootWarning(); + void _updateFilterMenu(); void _filterSyncCBoxUpdate(kshark_context *kshark_ctx); From patchwork Mon Aug 26 15:58:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11114983 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 B93BE174A for ; Mon, 26 Aug 2019 15:58:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 977C0217F5 for ; Mon, 26 Aug 2019 15:58:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rt0SDzkw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731863AbfHZP6k (ORCPT ); Mon, 26 Aug 2019 11:58:40 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34859 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730995AbfHZP6j (ORCPT ); Mon, 26 Aug 2019 11:58:39 -0400 Received: by mail-wr1-f65.google.com with SMTP id k2so15857513wrq.2 for ; Mon, 26 Aug 2019 08:58:37 -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=9LzchsrFO+iJC3qHpx3kwMRiGxsuCBQRvPsAQe+kHoM=; b=Rt0SDzkw2ZDrYTTNdUGek/3LWziLq1yG5nQVolceGZGef5S0gFrzNAd4yQmhB0AiSF U4cpqEzgsxcxxNbheCs1PxBo9aFYsl5SjaFKqwvH8ic5JIM0cKzCoaLxGU7VOecSOJja qDc47mnc1qpLYMGJFNNfU/IG7Dfiqu59xjJMzSDA/8/dlrdGu4MZ8S7aHkL7g8zQfXMO /fPUqo+NntvbODr8HlcXJ6MIpC+DqKSgbH5Ui8GgFCrBNPyGJQ4OY/p6XSlHfSULeaX0 6Z1x0Or5d61NdW38eHXKyVRVpSeE2esDo75Zm154SDERsrdy1W+mNzFjsacmiOvFj5MJ vyIQ== 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=9LzchsrFO+iJC3qHpx3kwMRiGxsuCBQRvPsAQe+kHoM=; b=liXWKPoBQP2bPFvQC7pJKcWy0/12OqUhlHtUyMEuc8ijUfkyG4xiVGwZ5vLcEGvkpc GHr6vXDjkEoWHnWmOeVlUisPoFKuqNyD5Oli4GAY8UwooCdWywjHT57XmykFaMvlNq13 vsxuNkFDtmANOBW/WiNj/OpDiwEFsJ0ndBDrn5Pg0Xv1cNYC6KfOURDAaCyn3MJQOyce xcyqoensFgYVfyh83AWsGwSmEm4B4NG+qbRUGKpJEd0Umkn9ouJDUemSEw5iOqNJrKif SKcLbX0yRaHRfKXr7K8oHw9KXcKSrvgHPPnlVq+M/o4RD0gYbxn3J8awvi9ekKh0VpWC W73Q== X-Gm-Message-State: APjAAAWkvurothi01tJsy5Rfc+HCwWHM1MG0jHnG1QD6pXZHGEIPQysp /cipKqDVlhtb1HSA1P4KIOw= X-Google-Smtp-Source: APXvYqxInu91jLNX5yo4C/BTmbg3PpzXktP3824vKafCRY+GpdA30Ltn/yxINhwwmJI/KnwMnRH44A== X-Received: by 2002:a05:6000:4d:: with SMTP id k13mr23407572wrx.196.1566835117118; Mon, 26 Aug 2019 08:58:37 -0700 (PDT) Received: from localhost.localdomain ([84.40.85.140]) by smtp.gmail.com with ESMTPSA id p13sm14447458wrw.90.2019.08.26.08.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 08:58:36 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, mike.auty@gmail.com, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 2/5] kernel-shark: Don't use pkexec when running as Root Date: Mon, 26 Aug 2019 18:58:08 +0300 Message-Id: <20190826155811.32021-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190826155811.32021-1-y.karadz@gmail.com> References: <20190826155811.32021-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 If KernelShark GUI has been started as Root we do not need to use "pkexec" when starting the Record dialog. Note that the actual place where "pkexec" gets used is in the script "kshark-su-record". Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsMainWindow.cpp | 47 +++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index 2f86517..7c18391 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp @@ -883,23 +883,26 @@ void KsMainWindow::_pluginAdd() void KsMainWindow::_record() { -#ifndef DO_AS_ROOT + bool canDoAsRoot(false); - QErrorMessage *em = new QErrorMessage(this); - QString message; - - message = "Record is currently not supported."; - message += " Install \"pkexec\" and then do:
"; - message += " cd build
sudo ./cmake_uninstall.sh
"; - message += " ./cmake_clean.sh
cmake ..
make
"; - message += " sudo make install"; +#ifdef DO_AS_ROOT + canDoAsRoot = true; +#endif - em->showMessage(message); - qCritical() << "ERROR: " << message; + if (geteuid() && !canDoAsRoot) { + QErrorMessage *em = new QErrorMessage(this); + QString message; - return; + message = "Record is currently not supported."; + message += " Install \"pkexec\" and then do:
"; + message += " cd build
sudo ./cmake_uninstall.sh
"; + message += " ./cmake_clean.sh
cmake ..
make
"; + message += " sudo make install"; -#endif + em->showMessage(message); + qCritical() << "ERROR: " << message; + return; + } _capture.start(); } @@ -1134,9 +1137,24 @@ void KsMainWindow::loadSession(const QString &fileName) void KsMainWindow::_initCapture() { + bool canDoAsRoot(false); + #ifdef DO_AS_ROOT + canDoAsRoot = true; +#endif + + if (geteuid() && !canDoAsRoot) + return; - _capture.setProgram("kshark-su-record"); + if (geteuid()) { + _capture.setProgram("kshark-su-record"); + } else { + QStringList argv; + + _capture.setProgram("kshark-record"); + argv << QString("-o") << QDir::homePath() + "/trace.dat"; + _capture.setArguments(argv); + } connect(&_capture, &QProcess::started, this, &KsMainWindow::_captureStarted); @@ -1155,7 +1173,6 @@ void KsMainWindow::_initCapture() connect(&_captureLocalServer, &QLocalServer::newConnection, this, &KsMainWindow::_readSocket); -#endif } void KsMainWindow::_captureStarted() From patchwork Mon Aug 26 15:58:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11114985 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 76D34174A for ; Mon, 26 Aug 2019 15:58:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54AF6217F5 for ; Mon, 26 Aug 2019 15:58:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BTI/i/EK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730995AbfHZP6l (ORCPT ); Mon, 26 Aug 2019 11:58:41 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38459 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732358AbfHZP6k (ORCPT ); Mon, 26 Aug 2019 11:58:40 -0400 Received: by mail-wr1-f65.google.com with SMTP id g17so15873888wrr.5 for ; Mon, 26 Aug 2019 08:58:39 -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=pGk3Fkj/UCkcl42ANHWIn9jjl0OuWDZv0D2iqKfZYb4=; b=BTI/i/EK/QYItZ/yW9iOxbP2VYLfAC6xN80M4xfprI4p/fMVV0WY9eL/1iLAM0d9IT 2VLnNRzgFFzsJWSOfvhjgvTyM3eB5r2/WGieV36LHM4SVtDtX+IXOFbmpaJip5PksZtK dUz9lom+CA197/ZAZXqEMa+wCmvURbh/UtijPSCs2b9D5XPPQ+KnYQ9UtKE6V/7iN71M w7nYuZVT6xAPyECxRozCkYzEZ0ogiTIVpQB5HBTy8hzJF+Qzv1EHYXMXWGhEotIJcaM3 XUAVKoJjdg+BjAgDsb3ll3qy0I8axPmWQ7AgVMcIWOL904D/J1wleFPw4Jf6yj2XTvAO 5WjA== 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=pGk3Fkj/UCkcl42ANHWIn9jjl0OuWDZv0D2iqKfZYb4=; b=rRGe5vHgXtcxemxCqjAP+YtofaMegqu3ibC0eC86aifQG9+eVf7Ic/x8BWNqIonGzC OPEvJD1q2eQjJRwFQTr9Tp/ac+YubKKlYLBBr/F281ot0TVREgXuGuhdIE2bvks6isq5 n6ClPorLe7g3Uk1ywIkbO9DXgne0PFmWe03hNIuo4E24AVdyHV7PSihQQfbKPiSOmXS+ GSgMjYecIZPe5iGfIoZuI4U7d7qTXs6C5pZn/CdIX8Fl/QJamHYtM8T/ZIfKLGVXGUde ZSJDad95SjmlWK1zcYGCEvN8KEgtWm5wJo1EdZliCk0Bykcg6zfH3i11VLuPOAaKFnVu UR2A== X-Gm-Message-State: APjAAAWZjjBGlSxqWY6kFIkciC7YVv4JV2wmKyo6SyIaR2E0PHtNkRbn R3J9xKCH44d6pWny4ach2pQ= X-Google-Smtp-Source: APXvYqyzGGvgchQFfreBH3ccofl+vlG7rUy4KD/ke7Vk64uvoe+uD5UB9/ofWi/28Y/9Ysypfr07BA== X-Received: by 2002:a5d:634c:: with SMTP id b12mr2209480wrw.127.1566835118614; Mon, 26 Aug 2019 08:58:38 -0700 (PDT) Received: from localhost.localdomain ([84.40.85.140]) by smtp.gmail.com with ESMTPSA id p13sm14447458wrw.90.2019.08.26.08.58.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 08:58:38 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, mike.auty@gmail.com, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 3/5] kernel-shark: Use standart error message in KsMainWindow::_record() Date: Mon, 26 Aug 2019 18:58:09 +0300 Message-Id: <20190826155811.32021-4-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190826155811.32021-1-y.karadz@gmail.com> References: <20190826155811.32021-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 error message is printed using the method KsMainWindow::_error(). The message itself remains unchanged. If we want to change the message, this can be done in another patch. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsMainWindow.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index 7c18391..73d6877 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp @@ -890,7 +890,6 @@ void KsMainWindow::_record() #endif if (geteuid() && !canDoAsRoot) { - QErrorMessage *em = new QErrorMessage(this); QString message; message = "Record is currently not supported."; @@ -899,8 +898,7 @@ void KsMainWindow::_record() message += " ./cmake_clean.sh
cmake ..
make
"; message += " sudo make install"; - em->showMessage(message); - qCritical() << "ERROR: " << message; + _error(message, "recordCantStart", false, false); return; } From patchwork Mon Aug 26 15:58:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11114987 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 1E2D016B1 for ; Mon, 26 Aug 2019 15:58:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE98820828 for ; Mon, 26 Aug 2019 15:58:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cK6apLkR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732398AbfHZP6m (ORCPT ); Mon, 26 Aug 2019 11:58:42 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42251 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731198AbfHZP6l (ORCPT ); Mon, 26 Aug 2019 11:58:41 -0400 Received: by mail-wr1-f68.google.com with SMTP id b16so15828354wrq.9 for ; Mon, 26 Aug 2019 08:58: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=Vtekc/8TUCgCSIe0sMbDvDKMF6iWu1EXAUFkTczUjYc=; b=cK6apLkRil25Xu6ukLeffh/P3bhzdgIgnR874fLAbH+xNPmzGbfOMnORGsDiGoORGj w9qzCXZRdovo0mTRqNlSjznHjQMQkVyREhwSP6pLD/cqSXOe8i4C3qbH96y8EW3ZW/d2 ePTyF3GJSDZYHmwesiYBmnkqSzxqubvqI0sYfuXsAV+WkFF2xEoTvO93P2/XaMRtIiDU 7H1c3qpe89nb9ZgXcpOeJqM+xOgwW4UEolocsKiwXTCYzJP7aqrli9Nz5B68i3ek4uAa gvxjVzINhGSJ0KBFOTKiQENsAgLp8infreOw5uX3HtN3Z3PWulnMAJi9A7sBpJAwuskt COoA== 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=Vtekc/8TUCgCSIe0sMbDvDKMF6iWu1EXAUFkTczUjYc=; b=OWsV97SB5uskIYtre0zj9oP0jBteb8D4o++jcPQs+u8G5LR61DHaNq4ExiwQoYmb4Q zZ13Q7VkS/vPo9Z8/Xjw+nnONwF3M5r7KOaMyYM4rD7VTqbASqzRNg6EHW6to0CnuwM8 wXl92Riz5cPEgJzCXrnVcw35mRdHFdNsU28mRNz3WlVNAg+Vqdjmo/fdejlmdz/GEAvR 6CIFrE/6xv9cKxm4G/16s1kKg0WQKdC23rkV3LFSbNscmFPTNXt9hzowceiDniUhQqMO zhgjsBj621EiH4500YkHTBVoMAkq0nJqOKCe6+l7Q7C6gTF+hJX/U2g7S+1bRdFz2Rym GHLw== X-Gm-Message-State: APjAAAUgz3SomAD3B4D5rM7hR+coi5h2qTdYGQL+Yg61rXAkZze1UY9n eaZa2M62mzquOyo8lu4pAEk= X-Google-Smtp-Source: APXvYqy20VAadhNbuXoW77/PD9huuS9tMuMGIrItKGVg5I1NTXvfbP2W3hXwkB6eMfrlyn+G9nX0rA== X-Received: by 2002:adf:8541:: with SMTP id 59mr23117402wrh.298.1566835119911; Mon, 26 Aug 2019 08:58:39 -0700 (PDT) Received: from localhost.localdomain ([84.40.85.140]) by smtp.gmail.com with ESMTPSA id p13sm14447458wrw.90.2019.08.26.08.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 08:58:39 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, mike.auty@gmail.com, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 4/5] kernel-shark: Optimize the error messages when "Record" fails to start Date: Mon, 26 Aug 2019 18:58:10 +0300 Message-Id: <20190826155811.32021-5-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190826155811.32021-1-y.karadz@gmail.com> References: <20190826155811.32021-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 Removing duplicate code. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsMainWindow.cpp | 14 +++++++------- kernel-shark/src/KsMainWindow.hpp | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index 73d6877..651cf59 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp @@ -1199,18 +1199,18 @@ void KsMainWindow::_captureFinished(int ret, QProcess::ExitStatus st) return; } - if (ret != 0 && st == QProcess::NormalExit) { - QString message = "Capture process failed:
"; - - message += capture->errorString(); - message += capture->readAllStandardError(); - _error(message, "captureFinishedErr", false, false); - } + if (ret != 0 && st == QProcess::NormalExit) + _captureErrorMessage(capture); } void KsMainWindow::_captureError(QProcess::ProcessError error) { QProcess *capture = (QProcess *)sender(); + _captureErrorMessage(capture); +} + +void KsMainWindow::_captureErrorMessage(QProcess *capture) +{ QString message = "Capture process failed:
"; message += capture->errorString(); diff --git a/kernel-shark/src/KsMainWindow.hpp b/kernel-shark/src/KsMainWindow.hpp index 4a7b8ab..eef4f96 100644 --- a/kernel-shark/src/KsMainWindow.hpp +++ b/kernel-shark/src/KsMainWindow.hpp @@ -215,6 +215,8 @@ private: void _captureError(QProcess::ProcessError error); + void _captureErrorMessage(QProcess *capture); + void _readSocket(); void _splitterMoved(int pos, int index); From patchwork Mon Aug 26 15:58:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11114989 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 11426184E for ; Mon, 26 Aug 2019 15:58:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E3491217F5 for ; Mon, 26 Aug 2019 15:58:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kQeR/Egt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732399AbfHZP6n (ORCPT ); Mon, 26 Aug 2019 11:58:43 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:43400 "EHLO mail-wr1-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732358AbfHZP6m (ORCPT ); Mon, 26 Aug 2019 11:58:42 -0400 Received: by mail-wr1-f49.google.com with SMTP id y8so15822720wrn.10 for ; Mon, 26 Aug 2019 08:58:41 -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=OJwPOInCRgMIIkP1ZIlezZ2ICpdstTAzxqMpKVnFCVI=; b=kQeR/EgtOb6QdXmIJdnDZo5/4VbZrM6ta6N4Guj1wOOJmDmC3C1cw6CniayqMoDDyT tjUbfW/kidpRmrAwgyJs3uMC5iKRFkpm2WpgpiJtQQSdPSxcpcMVumOjiVk5FMA226X0 sOi7lz7evjqIbBufiQ5BwJ49QxP47O+2t7lEss1/htF49obnGyv4NpAqJ3eol4eMq++P qX43UsSPAJsZbFgYV/2U6STgu75T7o9rBImF+anAxJGN6/D5iiZZEJJlT+3f/qs2/erB zw8WjdpGcs8eR7QP03Nq76LPqvTx9YltWsROYK4bQb/TqxjKMZDFk4tZASV6qjlNeciG dXAA== 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=OJwPOInCRgMIIkP1ZIlezZ2ICpdstTAzxqMpKVnFCVI=; b=om5Kd92NkjEXShJfD2WHaoB26c0qBofgB6DF1or56C46QnVuJtemWEcbPoyeRcxKCO eDwnaADUgc+jBS0t+WJFOpe3EWIK+4WF4GZXAV03+RV5xAYl/8nlaGtlftqrOAvEwXqz KyNEn2Ex6XeH+Vgz1bgrxrHJCcLLKMUvwvcdnZbPx1ZVySvYxdGMJLQLSoURa4oJjxfq xnfoQ9BsIB36OgScK7dm0wirSSf/pkGaN3B5r7dyn9GfnipxBkIAkWFGdeMW4nL/98Rs EMLPYoMvZY+7kVY5hgOYmyY1MxVjOBhBuOKbYcvSMizGWDJuSeeHIdCvoyn16IwnU24e tKTA== X-Gm-Message-State: APjAAAUzY3rfe9EPH5efS2geYM1rz0mYQfXCd4PynSxhNGYMdg6AuShK wSPMzbqLOWDLzMoGigDtlnhyqVx+ X-Google-Smtp-Source: APXvYqxERTqLPsZuIb8TtqY9LwOf2/tiUC/FkSa5iTuVVEuEFrpGjotQ/QgTlNUbVzARTcUSEji9QQ== X-Received: by 2002:adf:facc:: with SMTP id a12mr12199840wrs.205.1566835121342; Mon, 26 Aug 2019 08:58:41 -0700 (PDT) Received: from localhost.localdomain ([84.40.85.140]) by smtp.gmail.com with ESMTPSA id p13sm14447458wrw.90.2019.08.26.08.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 08:58:40 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, mike.auty@gmail.com, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 5/5] kernel-shark: Better formatting of the error messages from "Record" Date: Mon, 26 Aug 2019 18:58:11 +0300 Message-Id: <20190826155811.32021-6-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190826155811.32021-1-y.karadz@gmail.com> References: <20190826155811.32021-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 Make the message easier to read and understand by separating the QProcess's error and the Standard error. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsMainWindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel-shark/src/KsMainWindow.cpp b/kernel-shark/src/KsMainWindow.cpp index 651cf59..a3b5ce7 100644 --- a/kernel-shark/src/KsMainWindow.cpp +++ b/kernel-shark/src/KsMainWindow.cpp @@ -1211,9 +1211,10 @@ void KsMainWindow::_captureError(QProcess::ProcessError error) void KsMainWindow::_captureErrorMessage(QProcess *capture) { - QString message = "Capture process failed:
"; + QString message = "Capture process failed: "; message += capture->errorString(); + message += "
Standard Error :"; message += capture->readAllStandardError(); _error(message, "captureFinishedErr", false, false); }