From patchwork Wed Sep 18 14:23:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11150487 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 0BC7816B1 for ; Wed, 18 Sep 2019 14:24:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD03721924 for ; Wed, 18 Sep 2019 14:24:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UXBxhqFw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727273AbfIROYT (ORCPT ); Wed, 18 Sep 2019 10:24:19 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39146 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725902AbfIROYT (ORCPT ); Wed, 18 Sep 2019 10:24:19 -0400 Received: by mail-wm1-f66.google.com with SMTP id v17so273591wml.4 for ; Wed, 18 Sep 2019 07:24:18 -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=Rie2zl85JdSuDWSW7erJSkpG2/BsRM8suWlDpQuD1sA=; b=UXBxhqFwghxNbdvMPsZTehN4csdIaqtIS9LnJZqNspudu3bQGYYLP+tZ/oppRNNHd5 WZBoUbeW0RrRrl6GNdf0lBI5cTtKQsLbQ3uSMyfF5UWA5VVrJlRAgxSNQFnYuHIpaxEy UdDT2bdGzISAQQnmEkzMq0Yv25QVygtNYEEXZZopXPKuJ9v58kePy4yQuKlWBivP9hPL DWSPAsTVFAc87bLJ5QRUMdbK/j/neuf0lurTHxw8aDp1neXnrCv5vceTcltrL7jNY6Ss N/sEq2GZPsta/1poHu5nah/uI7x7skqyLcb1LYFk1PVrw8Q97Y9PM+HGf77f1PY4t206 zv4g== 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=Rie2zl85JdSuDWSW7erJSkpG2/BsRM8suWlDpQuD1sA=; b=MyAX8jSeO+E3yMUwmYgkFm62BKtxR/BfhmXVZNIoCjk1Bn9Q/K4ffYsNixpq4GvqQf YugSPsio4cDH/31to48r/EgykT5fuVrN5Lk3ypqQ26e5TZNhBNxSQEqwN8884+354csj RLcjMklCXvl6SIRHhRjaGmzVTHDhYBKSyTvfalL8yd/ryi2C58AC9dJ8ciY2o066c0ge IrXFklJPzoa1jUtKZPlpM8rdtlkXENK5UFjAKFGNjvmZpSTulCkt+txyhtLaeb/SzTmY AMEO6NDQ62Li3Emle1qWe6Bu9wtMJ974L8Q7yA6tVWULkstzFfpJ1Ga4QyhujYERi5h4 CUWA== X-Gm-Message-State: APjAAAUTfDHDHEAyExaVshs+yh22ZX+2ypHNcRg6/gShsNmAny7hLAND zIzB3nV8OZStlDg9nmm1jJ6BmQAi X-Google-Smtp-Source: APXvYqyztdeYrOAJ5sVXr0bYitSyqIdzwzCbwLz/6kAjbbD1toPrhB/4jai3hOT+T1wzAR1JtoSVmw== X-Received: by 2002:a05:600c:2108:: with SMTP id u8mr3317315wml.13.1568816657468; Wed, 18 Sep 2019 07:24:17 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id a10sm7526251wrv.64.2019.09.18.07.24.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:24:16 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, stephen@brennan.io, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 1/3] kernel-shark: Provide parsing for quotation marks in Record command line Date: Wed, 18 Sep 2019 17:23:17 +0300 Message-Id: <20190918142319.11821-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190918142319.11821-1-y.karadz@gmail.com> References: <20190918142319.11821-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 Shell-like parsing of quotation marks in the content of the "Command" field of the "Record" dialog will give more options to the users. For example, now we can trace python -c 'print("hello world")' The patch also adds support for multi-line command options. Suggested-by: Stephen Brennan Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204679 Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsCaptureDialog.cpp | 10 +++++-- kernel-shark/src/KsUtils.cpp | 41 ++++++++++++++++++++++++++++ kernel-shark/src/KsUtils.hpp | 2 ++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp index dc1e9b2..7c2ef46 100644 --- a/kernel-shark/src/KsCaptureDialog.cpp +++ b/kernel-shark/src/KsCaptureDialog.cpp @@ -170,7 +170,8 @@ QStringList KsCaptureControl::getArgs() argv << _eventsWidget.getCheckedEvents(true); argv << "-o" << outputFileName(); - argv << _commandLineEdit.text().split(" "); + + argv << KsUtils::splitArguments(_commandLineEdit.text()); return argv; } @@ -350,7 +351,10 @@ void KsCaptureControl::_browse() void KsCaptureControl::_apply() { - emit argsReady(getArgs().join(" ")); + QStringList argv = getArgs(); + + if (argv.count()) + emit argsReady(argv.join(" ")); } /** @brief Create KsCaptureMonitor widget. */ @@ -547,7 +551,7 @@ void KsCaptureDialog::_capture() int argc; if(_captureMon._argsModified) { - argv = _captureMon.text().split(" "); + argv = KsUtils::splitArguments(_captureMon.text()); } else { argv = _captureCtrl.getArgs(); } diff --git a/kernel-shark/src/KsUtils.cpp b/kernel-shark/src/KsUtils.cpp index 58ce8c1..e99509f 100644 --- a/kernel-shark/src/KsUtils.cpp +++ b/kernel-shark/src/KsUtils.cpp @@ -257,6 +257,47 @@ QString getSaveFile(QWidget *parent, return fileName; } +/** + * Separate the command line arguments inside the string taking into account + * possible shell quoting and new lines. + */ +QStringList splitArguments(QString cmd) +{ + QString::SplitBehavior opt = QString::SkipEmptyParts; + int i, progress = 0, size; + QStringList argv; + QChar quote = 0; + + /* Remove all new lines. */ + cmd.replace("\\\n", " "); + + size = cmd.count(); + auto lamMid = [&] () {return cmd.mid(progress, i - progress);}; + for (i = 0; i < size; ++i) { + if (cmd[i] == '\\') { + cmd.remove(i, 1); + size --; + continue; + } + + if (cmd[i] == '\'' || cmd[i] == '"') { + if (quote.isNull()) { + argv << lamMid().split(" ", opt); + quote = cmd[i++]; + progress = i; + } else if (quote == cmd[i]) { + argv << lamMid(); + quote = 0; + progress = ++i; + } + } + } + + argv << cmd.right(size - progress).split(" ", opt); + + return argv; +} + }; // KsUtils /** A stream operator for converting QColor into KsPlot::Color. */ diff --git a/kernel-shark/src/KsUtils.hpp b/kernel-shark/src/KsUtils.hpp index 7362c14..db1bf5e 100644 --- a/kernel-shark/src/KsUtils.hpp +++ b/kernel-shark/src/KsUtils.hpp @@ -130,6 +130,8 @@ QString getSaveFile(QWidget *parent, const QString &extension, QString &lastFilePath); +QStringList splitArguments(QString cmd); + }; // KsUtils /** Identifier of the Dual Marker active state. */ From patchwork Wed Sep 18 14:23:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11150489 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 08D701745 for ; Wed, 18 Sep 2019 14:24:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3F4C21924 for ; Wed, 18 Sep 2019 14:24:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eEFGB8Ts" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730029AbfIROYW (ORCPT ); Wed, 18 Sep 2019 10:24:22 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37247 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725902AbfIROYW (ORCPT ); Wed, 18 Sep 2019 10:24:22 -0400 Received: by mail-wm1-f67.google.com with SMTP id f16so288896wmb.2 for ; Wed, 18 Sep 2019 07:24:20 -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=BZuDjXgRuhQlde+olFqRQbMGAoEiI/QmyKJVEoHBlOk=; b=eEFGB8TsBj7KFQIE7xOkK9aRSPHIFViEm1DY6ngjci3/ZlshmR3H3v1K4ED67rvtNO CJfwijPICh0KFMVWO7Y7mq8yoBuMp/kpwOiMHDeX2z77G1aKtqmLvNc+3FC9aIidQOls fkxsdeQUmNNpI3zUzAsp9rTsXSmyCLY9sGpZvJwt9+ftU/3gKNG5a1eQaWjAb6NXFBP9 hOb5G6pOigPX49jhfpYMq7mnsV8O87upAYqZ44ylPKInXsTc3ysCXvl8YBrI9sIYE+WB /qSKHUGVKRbM3YaOIgfbRMT3ENsDBMj+6sii+DZF//OeWj2PxpcQ2D26UONCmXFSRrhk fzfA== 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=BZuDjXgRuhQlde+olFqRQbMGAoEiI/QmyKJVEoHBlOk=; b=k7FdUhyV7beoE9t7lbfW9V3Y23AjPlJHKhSc7Eva5ljcok5VVp6Cnn3M3WvA73Jg2t O23h7JTmySTy9F/lqoIdkLbaZemhaoNNO6y7M49oWS3+WxuvmoW8dbNnkjQhant94jby BPM2ZzarsiH92jDboc926WkLheMs2WFxFN7XyBBzIBg6FTOTQ4LknA24Mw86VQRFkwfU i8NQ92mB5DwrwMSXmho5God2SOcrJA+/cgvVin9LIIM0ZcjzyFw3zpOW9IOx1mjDYBPP Igv9uDpjiIvGDmvoSjiExxqInQ4VOR2P+2LtXCn6ccnzgdCXiAPnfjrPh3JjIChopsrl 0uVQ== X-Gm-Message-State: APjAAAXJsOk2djGyLztYnGuFMfFHBnzfiGDCnWe+RWzUO/siMDbeij62 BB6kMwDIR3mmT1nSUhNxueQ= X-Google-Smtp-Source: APXvYqxdoblD+d+gI8NpnKkXGjJef/snLqzL6bMe4uMfzgt8vfOHhsQRdyLlbl+60gouRABxNWXqJg== X-Received: by 2002:a1c:2b41:: with SMTP id r62mr3049542wmr.47.1568816660116; Wed, 18 Sep 2019 07:24:20 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id a10sm7526251wrv.64.2019.09.18.07.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:24:19 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, stephen@brennan.io, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 2/3] kernel-shark: give more space to the command field of the Record dialog Date: Wed, 18 Sep 2019 17:23:18 +0300 Message-Id: <20190918142319.11821-3-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190918142319.11821-1-y.karadz@gmail.com> References: <20190918142319.11821-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 Since the Record dialog not support parsing of complex multi-line commands the corresponding field of the widget has to be able to accommodate such multi-line user input. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/src/KsCaptureDialog.cpp | 29 +++++++++++++++++++++++++--- kernel-shark/src/KsCaptureDialog.hpp | 18 ++++++++++++++++- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/kernel-shark/src/KsCaptureDialog.cpp b/kernel-shark/src/KsCaptureDialog.cpp index 7c2ef46..fff42aa 100644 --- a/kernel-shark/src/KsCaptureDialog.cpp +++ b/kernel-shark/src/KsCaptureDialog.cpp @@ -29,6 +29,25 @@ static inline tep_handle *local_events() return tracecmd_local_events(tracecmd_get_tracing_dir()); } +/** + * @brief Create KsCommandLineEdit. + * + * @param text: Defaulst text to be shown. + * @param parent: The parent of this widget. + */ +KsCommandLineEdit::KsCommandLineEdit(QString text, QWidget *parent) +: QPlainTextEdit(text, parent) {} + +QSize KsCommandLineEdit::minimumSizeHint() const +{ + return {FONT_WIDTH * 30, FONT_HEIGHT * 2}; +} + +QSize KsCommandLineEdit::sizeHint() const +{ + return {FONT_WIDTH * 30, FONT_HEIGHT * 3}; +} + /** @brief Create KsCaptureControl widget. */ KsCaptureControl::KsCaptureControl(QWidget *parent) : QWidget(parent), @@ -117,7 +136,11 @@ KsCaptureControl::KsCaptureControl(QWidget *parent) _commandLabel.adjustSize(); _commandLabel.setFixedWidth(_outputLabel.width()); _execLayout.addWidget(&_commandLabel, row, 0); + _commandLineEdit.setFixedWidth(FONT_WIDTH * 30); + _commandLineEdit.setMinimumHeight(FONT_HEIGHT * 2); + _commandLineEdit.setMaximumHeight(FONT_HEIGHT * 9); + _execLayout.addWidget(&_commandLineEdit, row, 1); _commandCheckBox.setCheckState(Qt::Unchecked); _commandCheckBox.adjustSize(); @@ -171,7 +194,7 @@ QStringList KsCaptureControl::getArgs() argv << "-o" << outputFileName(); - argv << KsUtils::splitArguments(_commandLineEdit.text()); + argv << KsUtils::splitArguments(_commandLineEdit.toPlainText()); return argv; } @@ -282,7 +305,7 @@ void KsCaptureControl::_importSettings() _outputLineEdit.setText(KS_C_STR_CAST(temp->conf_doc)); if (kshark_config_doc_get(conf, "Command", temp)) - _commandLineEdit.setText(KS_C_STR_CAST(temp->conf_doc)); + _commandLineEdit.setPlainText(KS_C_STR_CAST(temp->conf_doc)); } void KsCaptureControl::_exportSettings() @@ -330,7 +353,7 @@ void KsCaptureControl::_exportSettings() kshark_config_doc_add(conf, "Output", kshark_json_to_conf(jout)); /* Save the command. */ - comm = _commandLineEdit.text(); + comm = _commandLineEdit.toPlainText(); json_object *jcomm = json_object_new_string(comm.toStdString().c_str()); kshark_config_doc_add(conf, "Command", kshark_json_to_conf(jcomm)); diff --git a/kernel-shark/src/KsCaptureDialog.hpp b/kernel-shark/src/KsCaptureDialog.hpp index f8ddf4a..612080c 100644 --- a/kernel-shark/src/KsCaptureDialog.hpp +++ b/kernel-shark/src/KsCaptureDialog.hpp @@ -18,6 +18,20 @@ // KernelShark #include "KsWidgetsLib.hpp" +/** + * The KsCommandLineEdit class is used to override the default size hints of + * the QPlainTextEdit class. + */ +struct KsCommandLineEdit : public QPlainTextEdit +{ + KsCommandLineEdit(QString text, QWidget *parent = 0); + +private: + QSize sizeHint() const override; + + QSize minimumSizeHint() const override; +}; + /** * The KsCaptureControl class provides a control panel for the KernelShark * Capture dialog. @@ -57,7 +71,9 @@ private: QLabel _pluginsLabel, _outputLabel, _commandLabel; - QLineEdit _outputLineEdit, _commandLineEdit; + QLineEdit _outputLineEdit; + + KsCommandLineEdit _commandLineEdit; QToolBar _settingsToolBar, _controlToolBar; From patchwork Wed Sep 18 14:23:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11150491 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 77AA4195A for ; Wed, 18 Sep 2019 14:24:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55F4921924 for ; Wed, 18 Sep 2019 14:24:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tWwztvrQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725902AbfIROYX (ORCPT ); Wed, 18 Sep 2019 10:24:23 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:55497 "EHLO mail-wm1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729768AbfIROYX (ORCPT ); Wed, 18 Sep 2019 10:24:23 -0400 Received: by mail-wm1-f53.google.com with SMTP id a6so300065wma.5 for ; Wed, 18 Sep 2019 07:24:22 -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=JBYsA8Ck/cWefGhdXXIj6TfpObBg8c+Yz3+UuH7d+GM=; b=tWwztvrQPGxqCBJhGBPg9Kv7uAepBTjtg7UU3xVqJzgQNE5FRpcZinkTOtIlspd4qR kwxD3LJLr8HRto1OkU2+alhgAhPz5UAURzhxIlxGMzGDqzw4Ppio6VNb6niiPiou8cr9 Sl/nZrx1uYyF8UsVNKSbUUDAEsPju6d4QL79e9kesb9JssLZ+sXMuKpBmTLb3lgmuldw xtiUrlX7JemtJpY9OVUCM2XCvr+TyKlwIpwRSbsXEV1+8Xv+S5QzR81nhjB1OGZNbBnG eUitQ/sxPb9BhB1eHqjoww0gl+Q7b62O6EA3d5EMGMV0NBokHHQgO70K02i557/x6xHj kqhg== 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=JBYsA8Ck/cWefGhdXXIj6TfpObBg8c+Yz3+UuH7d+GM=; b=T7f5rf4j034xw+6KBTTe6OxSXEReH2nu9DmIKKJbCoTaVfQeMc2qVXV3EyH8lBse+z IRmRZM6WA/Kvo8yG51oBEfIcoodpqjF0QrM065QErK8y/WMESmUPzc1xB3O/NkBfhYBv u9otHxBH3hPOPyv490CHrzEvaBjUcVJqMKjLJsfKifRuY1hgY02RQ+IYX/7i/KJVqXkI 32Fear68SD0lpD69TKx36EhwC8oW7663G3j56FV2Jy/iRL9X4WfaFE+rf6qS/JdIEtud 68+HEm2Ti+Kg8xaS0VZDcUrCyVhD/A5FaKMxm1aU0Ke+adDuAbKRBALlXS9txpV0t42+ ZqYw== X-Gm-Message-State: APjAAAW68zFnELT90smafICXI2Vex1EGwcUfAAfzctcdmUvWZpstWuJH wTZxaxfIDdtTSzKTYgSk0oE= X-Google-Smtp-Source: APXvYqw72p4QZRCgWUEk9CafPaay7G2LDFF+siWHjO02kwlqTN/Mr8LrUCYvMOkWZknFlO5dd3cjxQ== X-Received: by 2002:a7b:cc0e:: with SMTP id f14mr3111893wmh.42.1568816661741; Wed, 18 Sep 2019 07:24:21 -0700 (PDT) Received: from mamba.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id a10sm7526251wrv.64.2019.09.18.07.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 07:24:21 -0700 (PDT) From: "Yordan Karadzhov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, stephen@brennan.io, "Yordan Karadzhov (VMware)" Subject: [PATCH v2 3/3] kernel-shark: Add quotation marks parsing example/test Date: Wed, 18 Sep 2019 17:23:19 +0300 Message-Id: <20190918142319.11821-4-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190918142319.11821-1-y.karadz@gmail.com> References: <20190918142319.11821-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 example implements a small GUI that executes shell commands. Signed-off-by: Yordan Karadzhov (VMware) --- kernel-shark/examples/CMakeLists.txt | 4 +++ kernel-shark/examples/cmd_split.cpp | 52 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 kernel-shark/examples/cmd_split.cpp diff --git a/kernel-shark/examples/CMakeLists.txt b/kernel-shark/examples/CMakeLists.txt index e16216e..35e6b1e 100644 --- a/kernel-shark/examples/CMakeLists.txt +++ b/kernel-shark/examples/CMakeLists.txt @@ -23,3 +23,7 @@ target_link_libraries(dplot kshark-plot) 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) diff --git a/kernel-shark/examples/cmd_split.cpp b/kernel-shark/examples/cmd_split.cpp new file mode 100644 index 0000000..ac68844 --- /dev/null +++ b/kernel-shark/examples/cmd_split.cpp @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* + * Copyright (C) 2017 VMware Inc, Yordan Karadzhov (VMware) + */ + +// C++ +#include +using namespace std; + +// Qt +#include + +// KernelShark +#include "KsUtils.hpp" + +int main(int argc, char **argv) +{ + QString text = "echo \"I want \\\" here\" \\\n \"and \\\' here\""; + QApplication a(argc, argv); + QStringList argList; + bool ok = true; + QProcess proc; + + while (ok) { + text = QInputDialog::getMultiLineText(nullptr, + "Shell quoting test", + "Shell input:", + text, + &ok); + + if (ok) { + argList = KsUtils::splitArguments(text); + qInfo() << argList; + + proc.setProgram(argList.takeFirst()); + proc.setArguments(argList); + + proc.start(); + proc.waitForFinished(); + + cout << proc.errorString().toStdString() + << endl + << proc.readAllStandardError().toStdString() + << endl + << proc.readAllStandardOutput().toStdString() + << endl; + } + } + + return 0; +}