From patchwork Mon Mar 25 15:58:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 10869541 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 B2BA815AC for ; Mon, 25 Mar 2019 16:02:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B87C29484 for ; Mon, 25 Mar 2019 16:02:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F63329488; Mon, 25 Mar 2019 16:02:31 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 352E229484 for ; Mon, 25 Mar 2019 16:02:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h8S1m-00025o-7U; Mon, 25 Mar 2019 16:00:46 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h8S1l-00025W-Ew for xen-devel@lists.xenproject.org; Mon, 25 Mar 2019 16:00:45 +0000 X-Inumbo-ID: 2588c0d2-4f17-11e9-bc90-bc764e045a96 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 2588c0d2-4f17-11e9-bc90-bc764e045a96; Mon, 25 Mar 2019 16:00:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6CE53084266; Mon, 25 Mar 2019 16:00:43 +0000 (UTC) Received: from localhost (ovpn-116-57.ams2.redhat.com [10.36.116.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B48DE6A6A6; Mon, 25 Mar 2019 16:00:28 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Mon, 25 Mar 2019 15:58:55 +0000 Message-Id: <20190325155857.10661-6-stefanha@redhat.com> In-Reply-To: <20190325155857.10661-1-stefanha@redhat.com> References: <20190325155857.10661-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 25 Mar 2019 16:00:44 +0000 (UTC) Subject: [Xen-devel] [PULL 5/7] scripts/cleanup-trace-events: Update for current practice X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , kvm@vger.kernel.org, David Hildenbrand , Jason Wang , Mark Cave-Ayland , Michael Roth , Gerd Hoffmann , Eric Blake , Stefano Stabellini , xen-devel@lists.xenproject.org, qemu-block@nongnu.org, Juan Quintela , Aleksandar Rikalo , Helge Deller , "Michael S. Tsirkin" , Markus Armbruster , Halil Pasic , Christian Borntraeger , Marcel Apfelbaum , Anthony Perard , =?utf-8?q?Marc-Andr=C3=A9_Lurea?= =?utf-8?q?u?= , David Gibson , Artyom Tarasenko , Eduardo Habkost , Riku Voipio , "Dr. David Alan Gilbert" , Yuval Shaia , Greg Kurz , Alex Williamson , Paul Durrant , Stefan Hajnoczi , Igor Mammedov , John Snow , Richard Henderson , Kevin Wolf , Laurent Vivier , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Cornelia Huck , qemu-s390x@nongnu.org, Max Reitz , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Andreas_F=C3=A4rber?= , Aurelien Jarno , Stefan Berger Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Armbruster Emit comments with shortened file names (previous commit). Limit search to the input file's directory. Cope with properties tcg (commit b2b36c22bd8) and vcpu (commit 3d211d9f4db). Cope with capital letters in function names. Signed-off-by: Markus Armbruster Message-id: 20190314180929.27722-4-armbru@redhat.com Message-Id: <20190314180929.27722-4-armbru@redhat.com> Signed-off-by: Stefan Hajnoczi --- scripts/cleanup-trace-events.pl | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/cleanup-trace-events.pl b/scripts/cleanup-trace-events.pl index e93abc00da..d4f0e4cab5 100755 --- a/scripts/cleanup-trace-events.pl +++ b/scripts/cleanup-trace-events.pl @@ -13,6 +13,7 @@ use warnings; use strict; +use File::Basename; my $buf = ''; my %seen = (); @@ -23,12 +24,19 @@ sub out { %seen = (); } -while (<>) { - if (/^(disable )?([a-z_0-9]+)\(/) { - open GREP, '-|', 'git', 'grep', '-lw', "trace_$2" +$#ARGV == 0 or die "usage: $0 FILE"; +my $in = $ARGV[0]; +my $dir = dirname($in); +open(IN, $in) or die "open $in: $!"; +chdir($dir) or die "chdir $dir: $!"; + +while () { + if (/^(disable |(tcg) |vcpu )*([a-z_0-9]+)\(/i) { + my $pat = "trace_$3"; + $pat .= '_tcg' if (defined $2); + open GREP, '-|', 'git', 'grep', '-lw', '--max-depth', '1', $pat or die "run git grep: $!"; - my $fname; - while ($fname = ) { + while (my $fname = ) { chomp $fname; next if $seen{$fname} || $fname eq 'trace-events'; $seen{$fname} = 1; @@ -49,3 +57,4 @@ while (<>) { } out; +close(IN) or die "close $in: $!";