From patchwork Thu Oct 6 16:35:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9365145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DC6C2607D3 for ; Thu, 6 Oct 2016 16:38:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE6EF291AB for ; Thu, 6 Oct 2016 16:38:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3388291AD; Thu, 6 Oct 2016 16:38:38 +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=-4.2 required=2.0 tests=BAYES_00, 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 AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5050E291AB for ; Thu, 6 Oct 2016 16:38:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsBeQ-0003Je-D8; Thu, 06 Oct 2016 16:36:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bsBeO-0003JF-JA for xen-devel@lists.xenproject.org; Thu, 06 Oct 2016 16:36:04 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 14/33-12967-37D76F75; Thu, 06 Oct 2016 16:36:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgkeJIrShJLcpLzFFi42JxWrohUrew9lu 4wd/Dehbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8a3mTdYC47wVmycsYG9gbGHq4uRk0NCwF+i 7+YsFhCbTUBXomnLX7YuRg4OEQEVidt7DUBMZoFQiR0vLEEqhAXCJe7u+cwEYrMAVSy5NJEZx OYV8JRoWfSNHWKinMT54z+ZQVqFBNQk5q6PhygRlDg58wnYImYBCYmDL16AlUgIcEv87bafwM gzC0nVLCRVCxiZVjGqF6cWlaUW6RrqJRVlpmeU5CZm5ugaGhjr5aYWFyemp+YkJhXrJefnbmI EhgYDEOxgXP7R6RCjJAeTkijvrfJv4UJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeFtqgHKCRanp qRVpmTnAIIVJS3DwKInwWoGkeYsLEnOLM9MhUqcYdTn+bJh8hUmIJS8/L1VKnLcapEgApCijN A9uBCxiLjHKSgnzMgIdJcRTkFqUm1mCKv+KUZyDUUmY1xdkCk9mXgncpldARzABHZG/9AvIES WJCCmpBsaCczbJq5cnaT5LXPDdKVWx7M5/6dwotw3M5y8wnEz5oW54cJ0CB1fn9721Rixxd59 tmbvv87TNVmGqbz02zOiXdvhds3pV7ft5vqu5lV7r6fG/epi0Yu93rfzGFdPqNHp4WUPutGUW n/j34M5s9ykHeRj0FB1X1pt/5F4z47a6fE+T4L7A+GAlluKMREMt5qLiRABjsrmLkwIAAA== X-Env-Sender: prvs=0807beae1=Ian.Jackson@citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1475771760!64159023!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50237 invoked from network); 6 Oct 2016 16:36:01 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 6 Oct 2016 16:36:01 -0000 X-IronPort-AV: E=Sophos;i="5.31,454,1473120000"; d="scan'208";a="382816718" From: Ian Jackson To: Date: Thu, 6 Oct 2016 17:35:49 +0100 Message-ID: <1475771750-12776-1-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 1/2] Executive: Break out task_spec_desc (no functional change) X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 137eb44..14f75b3 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -45,7 +45,7 @@ BEGIN { $VERSION = 1.00; @ISA = qw(Exporter); @EXPORT = qw(grabrepolock_reexec - findtask findtask_spec @all_lock_tables + task_spec_desc findtask findtask_spec @all_lock_tables restrictflight_arg restrictflight_cond report_run_getinfo report_altcolour report_altchangecolour @@ -524,6 +524,20 @@ END our $taskid; +sub task_spec_desc ($) { + my ($row) = @_; # NB row maybe modifed, to fill in username and comment + # => ($newspec, $desc); + + foreach my $k (qw(username comment)) { + next if defined $row->{$k}; + $row->{$k}= "[no $k]"; + } + + my $newspec = "$row->{taskid} $row->{type} $row->{refkey}"; + my $desc = "$row->{username} $row->{comment}"; + return ($newspec,$desc); +} + sub findtask_spec ($$) { my ($spec, $why) = @_; @@ -556,13 +570,8 @@ END die "task $what dead" unless $row->{live}; $q->finish(); - foreach my $k (qw(username comment)) { - next if defined $row->{$k}; - $row->{$k}= "[no $k]"; - } - - my $newspec= "$row->{taskid} $row->{type} $row->{refkey}"; - logm("${why}task $newspec: $row->{username} $row->{comment}"); + my ($newspec, $desc) = task_spec_desc($row); + logm("${why}task $newspec: $desc"); $taskid= $row->{taskid};