From patchwork Mon Aug 10 11:20:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11707311 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 1BD0F13B1 for ; Mon, 10 Aug 2020 11:21:39 +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 0221D206E9 for ; Mon, 10 Aug 2020 11:21:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0221D206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none 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 1k55rN-0008Fo-7G; Mon, 10 Aug 2020 11:20:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k55rL-0008Fj-57 for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 11:20:55 +0000 X-Inumbo-ID: d6fc8dc5-26af-483d-9627-9eef76f38bca Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d6fc8dc5-26af-483d-9627-9eef76f38bca; Mon, 10 Aug 2020 11:20:53 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k55rI-0003aJ-U4; Mon, 10 Aug 2020 12:20:53 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 1/6] cr-publish-flight-logs: Make a proper option parser Date: Mon, 10 Aug 2020 12:20:42 +0100 Message-Id: <20200810112047.30285-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 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: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" I was going to add another option but changed my mind. But, let's keep this patch anyway. Signed-off-by: Ian Jackson --- cr-publish-flight-logs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cr-publish-flight-logs b/cr-publish-flight-logs index faae7e0e..717cb957 100755 --- a/cr-publish-flight-logs +++ b/cr-publish-flight-logs @@ -28,9 +28,14 @@ our %c; readglobalconfig(); my $push_harness = 0; -if (@ARGV && $ARGV[0] =~ m{^--push-harness(?:-try)?$}) { - $push_harness = $&; - shift @ARGV; +while (@ARGV && $ARGV[0] =~ m{^-}) { + $_ = shift @ARGV; + last if $_ eq '--'; + if (m{^--push-harness(?:-try)?$}) { + $push_harness = $&; + } else { + die "unknown option \`$_' ?"; + } } my $flight= shift @ARGV // ''; From patchwork Mon Aug 10 11:20:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11707323 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 C322B109A for ; Mon, 10 Aug 2020 11:22:49 +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 A9407206E9 for ; Mon, 10 Aug 2020 11:22:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9407206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none 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 1k55rQ-0008Fy-FV; Mon, 10 Aug 2020 11:21:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k55rP-0008Fj-UW for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 11:20:59 +0000 X-Inumbo-ID: 276036f7-fddc-46d1-b86e-4ff89e0331dc Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 276036f7-fddc-46d1-b86e-4ff89e0331dc; Mon, 10 Aug 2020 11:20:54 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k55rJ-0003aJ-AT; Mon, 10 Aug 2020 12:20:53 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 2/6] timing traces: cr-publish-flight-logs: Report more progress Date: Mon, 10 Aug 2020 12:20:43 +0100 Message-Id: <20200810112047.30285-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200810112047.30285-1-ian.jackson@eu.citrix.com> References: <20200810112047.30285-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: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" More tools to see where it is faffing too much. Signed-off-by: Ian Jackson --- cr-publish-flight-logs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cr-publish-flight-logs b/cr-publish-flight-logs index 717cb957..ba5d3b70 100755 --- a/cr-publish-flight-logs +++ b/cr-publish-flight-logs @@ -43,6 +43,9 @@ die unless $flight =~ m/^\d*$/; die "usage: ./cr-publish-flight-logs [flight]" unless @ARGV==0; +sub progress { print (show_abs_time time), @_, "\n" } + +progress("acquiring publish-lock..."); open LOCK, "> $c{GlobalLockDir}/publish-lock" or die $!; flock LOCK, LOCK_EX or die $!; @@ -51,6 +54,7 @@ if ($push_harness) { my $gitdir= $c{HarnessPublishGitRepoDir}; if ($githost && $gitdir) { + progress("pushing..."); eval { system_checked("git push $githost:$gitdir HEAD:refs/heads/flight-$flight"); system_checked("ssh $githost 'cd $gitdir && git update-server-info'"); @@ -72,9 +76,10 @@ sub copydir ($$) { push @cmd, '-e', join(' ', map { s/\'/''/g; "'$_'"; } @ssh); #--bwlimit=50 push @cmd, $src, $dst; - print "+ @cmd\n"; + progress "+ @cmd"; $!=0; $?=0; system @cmd; die "rsync $? $!" if $? or $!; } copydir(qw(Logs), "/$flight") if $flight; copydir(qw(Results), ''); +progress "complete."; From patchwork Mon Aug 10 11:20:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11707321 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 CC53B109A for ; Mon, 10 Aug 2020 11:22:39 +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 B240C206E9 for ; Mon, 10 Aug 2020 11:22:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B240C206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none 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 1k55rV-0008GO-Na; Mon, 10 Aug 2020 11:21:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k55rU-0008Fj-Ul for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 11:21:04 +0000 X-Inumbo-ID: f70dfcdf-0d3f-4b96-aec0-c4ee5e881699 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f70dfcdf-0d3f-4b96-aec0-c4ee5e881699; Mon, 10 Aug 2020 11:20:54 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k55rJ-0003aJ-He; Mon, 10 Aug 2020 12:20:53 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 3/6] timing traces: cr-daily-branch: Add more calls to date >&2 Date: Mon, 10 Aug 2020 12:20:44 +0100 Message-Id: <20200810112047.30285-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200810112047.30285-1-ian.jackson@eu.citrix.com> References: <20200810112047.30285-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: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" More tools to see where it is faffing too much. Signed-off-by: Ian Jackson --- cr-daily-branch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cr-daily-branch b/cr-daily-branch index d84dcc8e..b8f221ee 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -51,6 +51,7 @@ determine_version () { if [ "x$FORCE_REVISION" != x ]; then tversion="$FORCE_REVISION" else + date >&2 tversion=`$AP_FETCH_PFX ./ap-fetch-version "$tbranch"` fi determine_tree "$treevarwhich" "" _${treevarwhich} @@ -98,6 +99,7 @@ if [ "x$OLD_REVISION" = x ]; then # last test will have tested the previous upstream baseline OLD_REVISION=`check_tested --print-revision=$tree` else + date >&2 OLD_REVISION="`$AP_FETCH_PFX ./ap-fetch-version-old $branch`" fi ;; @@ -159,6 +161,7 @@ if [ "x$REVISION_XEN" = x ]; then export REVISION_XEN fi if [ "x$REVISION_PREVXEN" = x -a "x$prevxenbranch" != "x" ]; then + date >&2 REVISION_PREVXEN="`\ $AP_FETCH_PFX ./ap-fetch-version-baseline $prevxenbranch`" export REVISION_PREVXEN @@ -321,6 +324,7 @@ unset IFS if [ "x$OLD_REVISION" = xdetermine-late ]; then OLD_REVISION="`\ + date >&2 $AP_FETCH_PFX ./ap-fetch-version-baseline-late $branch $NEW_REVISION`" fi @@ -430,6 +434,7 @@ case "$NEW_REVISION/$OLD_REVISION" in case "$realtree" in xen-4*|xen-unstable*) + date >&2 oldqemu=`./ap-qemu-revision $realtree $OLD_REVISION` newqemu=`./ap-qemu-revision $realtree $NEW_REVISION` if [ "$oldqemu" ] && [ "$newqemu" ]; then @@ -445,6 +450,7 @@ case "$NEW_REVISION/$OLD_REVISION" in cat <tmp/$flight.people-touched People who touched revisions under test: END + date >&2 ./adhoc-people-touched-filter <$revlog \ >>tmp/$flight.people-touched touched_lines=`wc -l &2 : $flight $branch $OSSTEST_BLESSING $sgr_args $DAILY_BRANCH_PREEXEC_HOOK execute_flight $flight $OSSTEST_BLESSING +date >&2 + start_email $flight $branch "$sgr_args" "$subject_prefix" push=false @@ -502,6 +511,7 @@ elif $push; then echo >&2 "BAD PUSH REVISION $to_push" ;; [0-9a-f]*) + date >&2 if ./ap-push $branch $to_push 2>&1; then rm -f $branch.push $branch.force-rev perl -i~ -pe ' @@ -527,6 +537,7 @@ freebsd-*) if grep '^tolerable$' $mrof >/dev/null 2>&1 && $OSSTEST_ANOINT && [ "x$OSSTEST_BLESSING" == "xreal" ]; then IFS=$'\n' + date >&2 for anointed in `./mg-anoint list-prepared \ "freebsd build $freebsd_branch *"`; do # Update anointed versions @@ -554,4 +565,5 @@ if [ -f $revlog ]; then fi fi +date >&2 publish_send_email $flight From patchwork Mon Aug 10 11:20:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11707319 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 EC59A13B1 for ; Mon, 10 Aug 2020 11:22:37 +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 D1F06206E9 for ; Mon, 10 Aug 2020 11:22:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1F06206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none 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 1k55ra-0008H3-Vp; Mon, 10 Aug 2020 11:21:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k55rZ-0008Fj-Ux for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 11:21:09 +0000 X-Inumbo-ID: 5e45584a-3d19-4d05-a336-5bdc192aae41 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5e45584a-3d19-4d05-a336-5bdc192aae41; Mon, 10 Aug 2020 11:20:54 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k55rJ-0003aJ-QP; Mon, 10 Aug 2020 12:20:53 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 4/6] timing traces: sg-check-tested: Add prints of (show_abs_time time) Date: Mon, 10 Aug 2020 12:20:45 +0100 Message-Id: <20200810112047.30285-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200810112047.30285-1-ian.jackson@eu.citrix.com> References: <20200810112047.30285-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: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" More tools to see where it is faffing too much. Signed-off-by: Ian Jackson --- sg-check-tested | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sg-check-tested b/sg-check-tested index 7946e4b5..39c0d0c2 100755 --- a/sg-check-tested +++ b/sg-check-tested @@ -148,7 +148,7 @@ sub prepare_execute ($@) { my ($qtxt, @vars) = @_; print DEBUG "\n==========\n", $qtxt, "\n----------\n", (join ' | ', @vars), - "\n==========\n"; + "\n========== ".(show_abs_time time)."\n"; my $q= $dbh_tests->prepare($qtxt); $q->execute(@vars); return $q; @@ -169,7 +169,7 @@ sub search () { while (my $row= $q->fetchrow_hashref()) { my $flight= $row->{flight}; if (!defined $prrev) { - print DEBUG "==========YES\n"; + print DEBUG "========== ".(show_abs_time time)." YES\n"; output $flight,"\n"; return; } else { @@ -195,7 +195,7 @@ END my $row1= $valsq->fetchrow_hashref(); next unless defined $row1->{val} && length $row1->{val}; my $val1 = massage($row1->{val}); - print DEBUG "got $val1\n"; + print DEBUG (show_abs_time time)." got $val1\n"; while (my $row2 = $valsq->fetchrow_hashref()) { my $val2 = massage($row2->{val}); next if $val2 eq $val1; @@ -212,7 +212,7 @@ END return; } } - print DEBUG "==========NO\n"; + print DEBUG "========== ".(show_abs_time time)." NO\n"; } db_retry($dbh_tests, [], sub { From patchwork Mon Aug 10 11:20:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11707325 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 18F5A109A for ; Mon, 10 Aug 2020 11:22:51 +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 F32D0206E9 for ; Mon, 10 Aug 2020 11:22:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F32D0206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none 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 1k55rg-0008Ih-8U; Mon, 10 Aug 2020 11:21:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k55re-0008Fj-VB for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 11:21:14 +0000 X-Inumbo-ID: d25bf53b-c4b2-46da-8e49-dcfd55ead790 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d25bf53b-c4b2-46da-8e49-dcfd55ead790; Mon, 10 Aug 2020 11:20:54 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k55rK-0003aJ-2L; Mon, 10 Aug 2020 12:20:54 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 5/6] timing traces: Executive: Provide processing timestamp facilities Date: Mon, 10 Aug 2020 12:20:46 +0100 Message-Id: <20200810112047.30285-5-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200810112047.30285-1-ian.jackson@eu.citrix.com> References: <20200810112047.30285-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: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Nothing uses these yet. Signed-off-by: Ian Jackson --- Osstest/Executive.pm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index c46a979d..1e94b282 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -51,6 +51,7 @@ BEGIN { report_run_getinfo report_altcolour report_altchangecolour opendb_tests report_blessingscond report_find_push_age_info + log_stderr_timestamped tcpconnect_queuedaemon plan_search manual_allocation_base_jobinfo alloc_resources alloc_resources_rollback_begin_work @@ -293,11 +294,23 @@ sub restrictflight_arg ($) { $restrictflight_cond .= " AND flights.flight != $_" foreach split /,/, $1; return 1; + } elsif ($arg =~ m/^--report-processing-start-time$/) { + # This functionality is wanted by all the callers of + # restrictflight_arg and is here for convenience, rather than + # out of principle. + log_stderr_timestamped("starting..."); + return 1; } else { return 0; } } +sub log_stderr_timestamped ($) { + my $us = $0; + $us =~ s{.*/}{}; + print STDERR (show_abs_time time)." $us: @_\n"; +} + sub restrictflight_cond () { return "($restrictflight_cond)"; } From patchwork Mon Aug 10 11:20:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11707329 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 EC5A913B1 for ; Mon, 10 Aug 2020 11:22:59 +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 D2790206E9 for ; Mon, 10 Aug 2020 11:22:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2790206E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none 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 1k55rk-0008Jt-HV; Mon, 10 Aug 2020 11:21:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k55rj-0008Fj-VE for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 11:21:19 +0000 X-Inumbo-ID: 3a3d34f7-c5cd-43be-9fbb-eaaa765e87eb Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3a3d34f7-c5cd-43be-9fbb-eaaa765e87eb; Mon, 10 Aug 2020 11:20:55 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k55rK-0003aJ-9Z; Mon, 10 Aug 2020 12:20:54 +0100 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 6/6] timing traces: cri-args-hostlists: Add some timestamps Date: Mon, 10 Aug 2020 12:20:47 +0100 Message-Id: <20200810112047.30285-6-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200810112047.30285-1-ian.jackson@eu.citrix.com> References: <20200810112047.30285-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: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Pass --report-processing-start-time, and add some calls to date >&2. Signed-off-by: Ian Jackson --- cri-args-hostlists | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cri-args-hostlists b/cri-args-hostlists index 61572c2d..994e00c0 100644 --- a/cri-args-hostlists +++ b/cri-args-hostlists @@ -77,11 +77,13 @@ execute_flight () { rm -f abort check_stop_core '' + date >&2 ./cr-ensure-disk-space Logs ./cr-ensure-disk-space LogsPublish export OSSTEST_RESOURCE_PREINFO="[$branch $2]" + date >&2 set +e ./sg-execute-flight $1 $2 >tmp/$1.transcript 2>&1 local rc=$? @@ -120,11 +122,13 @@ start_email () { date >&2 with-lock-ex -w $globallockdir/report-lock \ - ./sg-report-job-history --html-dir=$job_html_dir --flight=$flight + ./sg-report-job-history --report-processing-start-time \ + --html-dir=$job_html_dir --flight=$flight date >&2 - ./sg-report-flight --html-dir=$flight_html_dir/$flight/ \ + ./sg-report-flight --report-processing-start-time \ + --html-dir=$flight_html_dir/$flight/ \ --allow=allow.all --allow=allow.$branch \ $sgr_args $flight >tmp/$flight.report ./cr-fold-long-lines tmp/$flight.report @@ -133,7 +137,8 @@ start_email () { mkdir -p $host_html_dir with-lock-ex -w $globallockdir/report-lock \ - ./sg-report-host-history --html-dir=$host_html_dir flight:$flight + ./sg-report-host-history --report-processing-start-time \ + --html-dir=$host_html_dir flight:$flight date >&2 }