From patchwork Mon Feb 1 14:28:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8180081 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 72D0D9F1C0 for ; Mon, 1 Feb 2016 14:31:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90DD920459 for ; Mon, 1 Feb 2016 14:30:59 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED49F203A9 for ; Mon, 1 Feb 2016 14:30:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQFT6-00066D-MV; Mon, 01 Feb 2016 14:28:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQFT4-00065h-Vw for xen-devel@lists.xen.org; Mon, 01 Feb 2016 14:28:39 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id F1/46-08479-69B6FA65; Mon, 01 Feb 2016 14:28:38 +0000 X-Env-Sender: prvs=832d3ee5e=Ian.Campbell@citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1454336915!19447152!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1136 invoked from network); 1 Feb 2016 14:28:37 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 1 Feb 2016 14:28:37 -0000 X-IronPort-AV: E=Sophos;i="5.22,380,1449532800"; d="scan'208";a="335277421" From: Ian Campbell To: , Date: Mon, 1 Feb 2016 14:28:29 +0000 Message-ID: <1454336912-28503-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1454336890.28781.99.camel@citrix.com> References: <1454336890.28781.99.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v1 2/5] mg-show-flight-runvars: move collection into a sub X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will make it easier to collect more rows. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- mg-show-flight-runvars | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/mg-show-flight-runvars b/mg-show-flight-runvars index 820c577..0995430 100755 --- a/mg-show-flight-runvars +++ b/mg-show-flight-runvars @@ -43,29 +43,35 @@ for (;;) { die unless @ARGV==1 && $ARGV[0] =~ m/^\w+$/; -our ($flight) = @ARGV; our @cols = qw(job name val); our @rows; +our @colws; -$flight =~ m/^\d+/ or $flight = "'$flight'"; -my $qfrom = "FROM runvars WHERE flight=$flight AND $synthcond"; +sub collect ($) { + my ($flight) = @_; -my @colws = $dbh_tests->selectrow_array - ("SELECT ".(join ',', map { "max(length($_))" } @cols)." $qfrom"); + $flight =~ m/^\d+/ or $flight = "'$flight'"; + my $qfrom = "FROM runvars WHERE flight=$flight AND $synthcond"; -my $q = $dbh_tests->prepare - ("SELECT synth, ".(join ',', @cols)." $qfrom ORDER BY synth, name, job"); -$q->execute(); + @colws = $dbh_tests->selectrow_array + ("SELECT ".(join ',', map { "max(length($_))" } @cols)." $qfrom"); -$colws[1] += length $synthsufx; + my $q = $dbh_tests->prepare + ("SELECT synth, ".(join ',', @cols)." $qfrom ORDER BY synth, name, job"); + $q->execute(); -while (my (@row) = $q->fetchrow_array()) { - my $synth = shift @row; - $row[1] .= $synthsufx if $synth && $synth ne 'f'; # sqlite3 is typeless - push @rows, \@row; + while (my (@row) = $q->fetchrow_array()) { + my $synth = shift @row; + $row[1] .= $synthsufx if $synth && $synth ne 'f'; # sqlite3 is typeless + push @rows, \@row; + } } +$colws[1] += length $synthsufx; + +collect($ARGV[0]); + foreach my $row (@rows) { printf "%-*s %-*s %-*s\n", map { $colws[$_], $row->[$_] } qw(0 1 2) or die $!;