From patchwork Fri Aug 14 17:21:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11714869 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 D6AC51392 for ; Fri, 14 Aug 2020 17:23:44 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2B2020708 for ; Fri, 14 Aug 2020 17:23:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="cGY9juJr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2B2020708 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6dPR-00029z-2r; Fri, 14 Aug 2020 17:22:29 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6dPP-00024H-Um for xen-devel@lists.xenproject.org; Fri, 14 Aug 2020 17:22:27 +0000 X-Inumbo-ID: 7cfade94-bd8a-4f7c-9479-4c87aaef6b90 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7cfade94-bd8a-4f7c-9479-4c87aaef6b90; Fri, 14 Aug 2020 17:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1597425733; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=JGVZgUM9Ou32fNfhr7w/FMv9cNbdn7S2Jl2MIBunzZQ=; b=cGY9juJrgezOfICmiqUbGeVTxrbXt5WqfkYrMtNZcVAvgVUFtgRsJdeN Plr+hsgpEU/vJG0B88etnO+jWF4FHKzbnKbIY8Fnt1cxIqD3WC9wy20Td 0E2J7q/EOYhsFcgpSGA4F9lUeS0GpFXF1qMnug7ATqdkhBC+xmWi8hLST 4=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: gGBUpPHDUEVc/bmQu3o7aloOTSEwnX+ETtRovKb0ZTBHJzZzwYL1Qmy7ht8vRXIHRBjFWIvx+c DEGKDM9B8g6IRsFsHl4y3u64j6OUh2xsfj+pJ4uc11DveaHaG6ziaoy6ejSfzHcY1XeYGSVYCY 4fRHCIkn335Rdxk6F6XBJUAbC+MWd9YyT0yg4ykiiA8zDvzRnLpLAi4X3VDILwrPrgxj5ERn2t 6WOzpaGoDMbjDcXF4bDWNdVQi3yf9xdDCSISjL7+C+7luuB/P1Ubo1jWVLrIgk6TSne/i2iGZr wAQ= X-SBRS: 2.7 X-MesageID: 24879728 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,313,1592884800"; d="scan'208";a="24879728" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 05/60] history reporting (nfc): Make cache_write_entry into a top-level sub Date: Fri, 14 Aug 2020 18:21:10 +0100 Message-ID: <20200814172205.9624-6-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200814172205.9624-1-ian.jackson@eu.citrix.com> References: <20200814172205.9624-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Ian Jackson --- sg-report-host-history | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sg-report-host-history b/sg-report-host-history index 83344a40..fe5b7cc2 100755 --- a/sg-report-host-history +++ b/sg-report-host-history @@ -112,6 +112,27 @@ sub cache_read_existing ($) { close H; } +sub cache_write_entry ($$) { + my ($fh, $jr) = @_; + print $fh "\n"; +} + sub computeflightsrange () { if ($flightlimit) { my $minflightsq = db_prepare(<{$k}; - s{[^-+=/~:;_.,\w]}{ sprintf "%%%02x", ord $& }ge; - printf H " %s=%s", $k, $_; - } - }; - $whash->($jr); - foreach my $hk (sort keys %$jr) { - next unless $hk =~ m/^\%/; - print H " $'"; - $whash->($jr->{$hk}); - } - print H " -->\n"; - }; - @rows = sort { $b->{finished} <=> $a->{finished} } @rows; print DEBUG "SORTED\n"; @@ -317,7 +317,7 @@ END foreach my $jr (@rows) { if ($wrote++ >= $limit) { - $write_cache_entry->($jr); + cache_write_entry(\*H, $jr); next; } @@ -417,7 +417,7 @@ END print H "" if !$any_power; print H "\n"; - $write_cache_entry->($jr); + cache_write_entry(\*H, $jr); print H "\n\n"; $alternate ^= 1;