From patchwork Wed Feb 3 09:48:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8199631 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8FF81BEEED for ; Wed, 3 Feb 2016 09:51:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A9332202BE for ; Wed, 3 Feb 2016 09:51:44 +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 B008B20270 for ; Wed, 3 Feb 2016 09:51:43 +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 1aQu3n-0002W4-Mp; Wed, 03 Feb 2016 09:49:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQu3m-0002Vw-LA for xen-devel@lists.xen.org; Wed, 03 Feb 2016 09:49:14 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id FF/30-31122-A1DC1B65; Wed, 03 Feb 2016 09:49:14 +0000 X-Env-Sender: prvs=8347a21d9=Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1454492938!12090759!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 28390 invoked from network); 3 Feb 2016 09:49:13 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 3 Feb 2016 09:49:13 -0000 X-IronPort-AV: E=Sophos;i="5.22,389,1449532800"; d="scan'208";a="335763062" From: Ian Campbell To: , Date: Wed, 3 Feb 2016 09:48:52 +0000 Message-ID: <1454492932-24427-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1454336912-28503-5-git-send-email-ian.campbell@citrix.com> References: <1454336912-28503-5-git-send-email-ian.campbell@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST 5/5 v2] mg-show-flight-runvars: recurse on buildjobs upon request 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 By looping over @rows looking for buildjobs runvars and adding those jobs to the output until nothing changes. The output is resorted by runvar name which is the desired default behaviour. As usual can be piped to sort(1) to sort by flight+job. Signed-off-by: Ian Campbell --- v2: - Use $jobcond,@jobconfparams to avoid SQL injection - Only recurse if the option was given - Drop synth from ORDER BY - Use a Schwatzian transform for the sort, at the same time allowing retention of the sorting of synth runvars last. --- mg-show-flight-runvars | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/mg-show-flight-runvars b/mg-show-flight-runvars index f96539f..faa0ea1 100755 --- a/mg-show-flight-runvars +++ b/mg-show-flight-runvars @@ -46,30 +46,56 @@ for (;;) { die unless @ARGV==1 && $ARGV[0] =~ m/^\w+$/; - our @cols = qw(job name val); our @rows; +our %jobs; + +sub collect ($;$@) { + my ($flight,$jobcond,@jobcondparams) = @_; -sub collect ($) { - my ($flight) = @_; + $jobcond //= "TRUE"; $flight =~ m/^\d+/ or $flight = "'$flight'"; - my $qfrom = "FROM runvars WHERE flight=$flight AND $synthcond"; + my $qfrom = "FROM runvars WHERE flight=$flight AND $synthcond AND $jobcond"; my $q = $dbh_tests->prepare - ("SELECT synth, ".(join ',', @cols)." $qfrom ORDER BY synth, name, job"); - $q->execute(); + ("SELECT synth, ".(join ',', @cols)." $qfrom ORDER BY name, job"); + $q->execute(@jobcondparams); while (my (@row) = $q->fetchrow_array()) { my $synth = shift @row; $row[0] = "$flight.$row[0]" if $recurse; $row[1] .= $synthsufx if $synth && $synth ne 'f'; # sqlite3 is typeless push @rows, \@row; + $jobs{$row[0]} = 1; } } collect($ARGV[0]); +if ($recurse) { + foreach my $row (@rows) { + next unless $row->[1] =~ m/^(?:.*_)?([^_]*)buildjob$/; + next if $jobs{$row->[2]}; + + # parse this flight and job, which must be in $flight.$job + # form if $recurse is true (see collect()) + my ($tflight, $tjob) = flight_otherjob(undef, $row->[0]); + die "$row->[1]" unless $tflight; + + # parse the buildjob reference and recurse. might be a job in + # this flight, in which case we still recurse since it might + # be a chain from a non-top-level job which hasn't been + # included yet. %jobs will prevent us from duplicating or + # infinite loops. + my ($oflight, $ojob) = flight_otherjob($tflight, $row->[2]); + collect($oflight, "job = ?", $ojob); + + # collect() appends to @rows, so we don't need any special + # handling to pickup anything which was newly added. + } +} + our @colws; sub max ($$) { $_[$_[0] < $_[1]] } foreach my $row (@rows) { @@ -77,7 +103,11 @@ foreach my $row (@rows) { } $colws[1] += length $synthsufx; -foreach my $row (@rows) { +# Sort by runvar name, then (flight+)job, synth runvars come last. +foreach my $row (map { $_->[0] } + sort { $a->[1] cmp $b->[1] } + map { [ $_, ($_->[1] =~ m/~$/)." $_->[1] $_->[0]" ] } + @rows) { printf "%-*s %-*s %-*s\n", map { $colws[$_], $row->[$_] } qw(0 1 2) or die $!; }