From patchwork Fri Apr 3 16:02:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11473041 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 065DF1392 for ; Fri, 3 Apr 2020 16:02:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCF382073B for ; Fri, 3 Apr 2020 16:02:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tD1hT/xk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727989AbgDCQCp (ORCPT ); Fri, 3 Apr 2020 12:02:45 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]:32996 "EHLO mail-lf1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727969AbgDCQCp (ORCPT ); Fri, 3 Apr 2020 12:02:45 -0400 Received: by mail-lf1-f42.google.com with SMTP id h6so1731156lfc.0 for ; Fri, 03 Apr 2020 09:02: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:mime-version :content-transfer-encoding; bh=LwGb8mkjWKC5oMkDNAsw/R4wBb3oaWZJjW7nCMsOeZE=; b=tD1hT/xklnUEMb1tnyBruOAyewFwsx9McqwgUwyTr85FsHv7deaKzbcKYjFUAphjgV YD4sJjGMvMjDbmQZSKqDqp3kXxE7oRjpc6Z/IFwa5g6Uqcg1H6hRyWXr465h0ziL/nmN M5zS3EMxSIGVIuviRCLu4pshtETH0cK/eUUPg11cV3JmGwpfMQ9hbPcCb14QKf5ZtC6F JULUm7uukNvcOYYVonkH+xmtmq/RQGOfmtdgVeL80yzpPO0EEFprWJVSfr1CRA8Fj72w cmu6kdNnKotcahRBntcMK18DDHxRgmgrxWRhAYe9XblH657krnxNFqCLn74mZB5/ts5P sc5A== 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=LwGb8mkjWKC5oMkDNAsw/R4wBb3oaWZJjW7nCMsOeZE=; b=Jx4G6e2t1KJcTe45LfA/WLZeldvLjAjpyA76bFxce54zpqk1xh/2/zILJYjwiecea8 MKpPqOCZqWv1PXHjxRKYEtXFBhKVVIXFj/xUua3PeAskz3laJKYGh2KJvJp0kRXxHKtm PD/6LRxFLWcIvspwjosmj5mrH1td4fu934KcoGjgcN9leeb6my/J+KMj32iU931p/iv3 A6TntPkF8mstd+pLmWO1/URZiK935tb9yXrA8HtQK3Xs4YmWpL0ggrZP2UwcIT0kLM/w bwK5YqxRtw8ASU7QyDrlCH0BK01FcXKYIpj5gLpBasixYRVQX//GpsCbr/3NswtmFkQA H+AQ== X-Gm-Message-State: AGi0Puaa/zBjoL3fVjffY8H192J13mbjG8ycsLmt2ckJfhf5rJPIocNZ lX9N5B+Z+zbSBuzYg0k7754= X-Google-Smtp-Source: APiQypJB4IgSfnMgfGEHqkSmkRAEdVxXLl6WRYyoKC+FESA4ENJVx3q/uTik0OJofFJY1BcJQzcEdA== X-Received: by 2002:a19:43:: with SMTP id 64mr5683694lfa.67.1585929762515; Fri, 03 Apr 2020 09:02:42 -0700 (PDT) Received: from localhost.localdomain ([84.40.73.10]) by smtp.gmail.com with ESMTPSA id b16sm6252747lfq.34.2020.04.03.09.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 09:02:41 -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-2.alpha: Allow appending multiple datafiles from command line Date: Fri, 3 Apr 2020 19:02:29 +0300 Message-Id: <20200403160230.11185-1-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 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 Multiple data files can be appended using the "-a" command line option. This can be done with: kernelshark -i foo -a bar1 -a bar2 or kernelshark -i foo -a "bar1 bar2" Signed-off-by: Yordan Karadzhov (VMware) --- src/kernelshark.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kernelshark.cpp b/src/kernelshark.cpp index bb51f88..590783f 100644 --- a/src/kernelshark.cpp +++ b/src/kernelshark.cpp @@ -17,7 +17,8 @@ #define default_input_file (char*)"trace.dat" -static char *prior_input_file, *app_input_file; +static char *prior_input_file; +QStringList appInputFiles; void usage(const char *prog) { @@ -57,7 +58,7 @@ int main(int argc, char **argv) break; case 'a': - app_input_file = optarg; + appInputFiles << QString(optarg).split(" ", QString::SkipEmptyParts); break; case 'p': @@ -99,8 +100,8 @@ int main(int argc, char **argv) if (prior_input_file) ks.loadDataFile(QString(prior_input_file)); - if (app_input_file) - ks.appendDataFile(QString(app_input_file)); + for (auto const &f: appInputFiles) + ks.appendDataFile(f); } ks.show(); From patchwork Fri Apr 3 16:02:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yordan Karadzhov X-Patchwork-Id: 11473043 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 527981392 for ; Fri, 3 Apr 2020 16:02:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 30DFF2077D for ; Fri, 3 Apr 2020 16:02:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NMX6McIx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390756AbgDCQCs (ORCPT ); Fri, 3 Apr 2020 12:02:48 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:34615 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390751AbgDCQCr (ORCPT ); Fri, 3 Apr 2020 12:02:47 -0400 Received: by mail-lj1-f194.google.com with SMTP id p10so7522009ljn.1 for ; Fri, 03 Apr 2020 09:02:46 -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=vah6znR3VQmy1jHG4xxhivXAN9nj3PDq5eosffFK3tY=; b=NMX6McIx1NtndzzR9cS3Qw6i70/FH6TBQ/D5oMFpfhqI//yehkMKnI9tnN2uF4t8OG 1qyVLupWZBNz8YTvPfy+W4Z7ZPVqcRRs2esW7rvNZArnyz7b8bpDJkS+Ym9L/iAe/LKq a6vKy0Tr9FxO+J125WZu2eWCtkDCXSxaLTeYgCGYCtgUiDmit+ktrYEuSMKjdBP1u1sJ efXGaqKK37k7BRs1oHV3jrlH3VmwHZQDv4Nmu62gYD30/PCxp39RVjy4wXGgZhfAQsFq 6S4qj3TddSekgrOCQm7Yoj6cCUTtE2VlkzUcTP6QQ5VJ0zrm+onOBbWq5pC4wx/5jL9m QFnw== 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=vah6znR3VQmy1jHG4xxhivXAN9nj3PDq5eosffFK3tY=; b=AndsitbNx2e5OyIr9au5boAO0OESzvLe7VtZDjii1YGR4jn1HsLl8ISGeJlJsOrMR0 zbrCnp/zP/YBhDa35BUTyGu3klHXhfd0coqjR/Uj/y6F/kE8HsA1Pg0jvjWhAv/VOf5I sAb4TtLHvRMD/9RBwIwN3jsbl5+A/Ht1cBTRvqgH20o0aMOob1uVanO4YmHYEDmIdp5r Ps2OFRhg78rqQowxp65bcoDoVXa851YC3rMbXuK6t7XA8CEnybd5sDP27CHD0vWC0Sen 6AfS7Z1NO8+9WgzvSP3Om/0ajsQsQ5u6S3wc8eXMF9KpnE8DOK7HMcqu5AhtT+GjM52B gkKQ== X-Gm-Message-State: AGi0PuaeUFNmxN/CD2zCSdA772Ssju4f0vyhTO04p4AF2p09ASPwR7OK uK0XmxK6OK71QTyhXUDzWpZn7epn X-Google-Smtp-Source: APiQypK8bMuoy9JCHQ11He0ILiJnsNYSjLR+g9uaU+5iYlZzYHTblFeZSRVutAJiKRAh8EAdz6ashQ== X-Received: by 2002:a2e:6e0f:: with SMTP id j15mr4928530ljc.230.1585929765319; Fri, 03 Apr 2020 09:02:45 -0700 (PDT) Received: from localhost.localdomain ([84.40.73.10]) by smtp.gmail.com with ESMTPSA id b16sm6252747lfq.34.2020.04.03.09.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 09:02:44 -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-2.alpha: Show the file name in the time offset dialog Date: Fri, 3 Apr 2020 19:02:30 +0300 Message-Id: <20200403160230.11185-2-y.karadz@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200403160230.11185-1-y.karadz@gmail.com> References: <20200403160230.11185-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 This is useful when appending multiple files from the command line. Signed-off-by: Yordan Karadzhov (VMware) --- src/KsMainWindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/KsMainWindow.cpp b/src/KsMainWindow.cpp index af8afb3..80a6537 100644 --- a/src/KsMainWindow.cpp +++ b/src/KsMainWindow.cpp @@ -1255,8 +1255,10 @@ void KsMainWindow::_load(const QString& fileName, bool append) if (append) { bool ok; + QString description = fileName + "\n\nOffset [usec]:"; + shift = QInputDialog::getDouble(this, tr("Append Trace file"), - tr("Offset [usec]:"), 0, + description, 0, INT_MIN, INT_MAX, 1, &ok); if (ok) shift *= 1000.;