From: Bjorn Munch
Date: April 7 2011 8:13am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3195) Bug#12316050
List-Archive: http://lists.mysql.com/commits/134894
X-Bug: 12316050
Message-Id: <201104070813.p378DPBa000443@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0309837650=="

--===============0309837650==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/dbx-55/ based on revid:bjorn.munch@stripped

 3195 Bjorn Munch	2011-04-07
      Bug #12316050 MTR: --REPORT-TIMES GIVES TOO HIGH NUMBER FOR INITIALIZATION
      Forgot that the main thread would be idle while waiting for tests
      Added sub mark_time_idle() so ignore time spent waiting
      Also added a new time category 'admin' to take some of 'init'

    modified:
      mysql-test/lib/mtr_misc.pl
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/mtr_misc.pl'
--- a/mysql-test/lib/mtr_misc.pl	2011-01-18 10:21:37 +0000
+++ b/mysql-test/lib/mtr_misc.pl	2011-04-07 08:12:52 +0000
@@ -1,5 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -36,6 +36,7 @@ sub start_timer($);
 sub has_expired($);
 sub init_timers();
 sub mark_time_used($);
+sub mark_time_idle();
 sub add_total_times($);
 sub print_times_used($$);
 sub print_total_times($);
@@ -224,6 +225,7 @@ my %time_used= (
   'ch-warn' => 0,
   'test'    => 0,
   'init'    => 0,
+  'admin'   => 0,
 );
 
 my %time_text= (
@@ -232,7 +234,8 @@ my %time_text= (
  'check'   => "Check-testcase",
  'ch-warn' => "Check for warnings",
  'test'    => "Test execution",
- 'init'    => "Initialization etc.",
+ 'init'    => "Initialization/cleanup",
+ 'admin'   => "Test administration",
 );
 
 # Counts number of reports from workers
@@ -255,6 +258,10 @@ sub mark_time_used($) {
   $last_timer_set= $curr_time;
 }
 
+sub mark_time_idle() {
+  $last_timer_set= gettimeofday() if $opt_report_times;
+}
+
 sub add_total_times($) {
   my ($dummy, $num, @line)= split (" ", $_[0]);
 

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-04-07 08:10:57 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-07 08:12:52 +0000
@@ -549,7 +549,9 @@ sub run_test_server ($$$) {
   my $s= IO::Select->new();
   $s->add($server);
   while (1) {
+    mark_time_used('admin');
     my @ready = $s->can_read(1); # Wake up once every second
+    mark_time_idle();
     foreach my $sock (@ready) {
       if ($sock == $server) {
 	# New client connected
@@ -891,7 +893,7 @@ sub run_worker ($) {
       if ( $opt_gprof ) {
 	gprof_collect (find_mysqld($basedir), keys %gprof_dirs);
       }
-      mark_time_used('init');
+      mark_time_used('admin');
       print_times_used($server, $thread_num);
       exit($valgrind_reports);
     }
@@ -3775,7 +3777,7 @@ sub run_testcase ($) {
 
   do_before_run_mysqltest($tinfo);
 
-  mark_time_used('init');
+  mark_time_used('admin');
 
   if ( $opt_check_testcases and check_testcase($tinfo, "before") ){
     # Failed to record state of server or server crashed
@@ -5248,7 +5250,7 @@ sub start_mysqltest ($) {
   my $exe= $exe_mysqltest;
   my $args;
 
-  mark_time_used('init');
+  mark_time_used('admin');
 
   mtr_init_args(\$args);
 


--===============0309837650==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/dbx-55/
# testament_sha1: 04c88a75fc8899dc72d616e6586cace200d0051c
# timestamp: 2011-04-07 10:13:25 +0200
# base_revision_id: bjorn.munch@stripped\
#   j6ge8p5nvxm97gvc
# 
# Begin bundle
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
WUy5v+LuSKcKEhr1Wflg


--===============0309837650==--