From: Christopher Powers
Date: August 26 2010 4:47pm
Subject: bzr push into mysql-trunk-bugfixing branch (chris.powers:3242 to 3243)
List-Archive: http://lists.mysql.com/commits/116931
Message-Id: <20100826164743.193401DB0368@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7576153894378252614=="

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

 3243 Christopher Powers	2010-08-26 [merge]
      merge

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_stat.h
 3242 Jon Olav Hauglid	2010-08-26
      Bug #56241 Valgrind/CDB warnings for many tests in trunk-bugfixing
      
      The reason for the warnings was that the performance schema
      instrumentation function release_table_share() could be called
      on a TABLE_SHARE that had already been free'd.
      
      The bug was introduced during merging of the patch for Bug#52044
      from mysql-5.5-bugfixing (which does not include the call to
      PSI release_table_share()) to mysql-trunk-bugfixing.
      
      This patch fixes the problem by moving the release_table_share()
      call to TABLE_SHARE::destroy() before the TABLE_SHARE is free'd.
      
      No test case added as this problem is detected by existing 
      valgrind tests.

    modified:
      sql/table.cc
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2010-08-23 16:44:14 +0000
+++ b/storage/perfschema/pfs.cc	2010-08-26 16:44:02 +0000
@@ -1744,18 +1744,26 @@ static void end_mutex_wait_v1(PSI_mutex_
   if (flag_events_waits_history_long)
     insert_events_waits_history_long(wait);
 
-  if (rc == 0 && wait->m_timer_state == TIMER_STATE_TIMED)
+  if (rc == 0)
   {
     /* Thread safe: we are protected by the instrumented mutex */
-    PFS_single_stat_chain *stat;
     PFS_mutex *mutex= pfs_locker->m_target.m_mutex;
+    PFS_single_stat_chain *stat= find_per_thread_mutex_class_wait_stat(wait->m_thread, mutex->m_class);
     mutex->m_owner= wait->m_thread;
     mutex->m_last_locked= wait->m_timer_end;
 
-    ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
-    aggregate_single_stat_chain(&mutex->m_wait_stat, wait_time);
-    stat= find_per_thread_mutex_class_wait_stat(wait->m_thread, mutex->m_class);
-    aggregate_single_stat_chain(stat, wait_time);
+    /* If timed then aggregate stats, else increment the value counts only */
+    if (wait->m_timer_state == TIMER_STATE_TIMED)
+    {
+      ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
+      aggregate_single_stat_chain(&mutex->m_wait_stat, wait_time);
+      aggregate_single_stat_chain(stat, wait_time);
+    }
+    else
+    {
+      increment_single_stat_chain(&mutex->m_wait_stat);
+      increment_single_stat_chain(stat);
+    }
   }
   wait->m_thread->m_wait_locker_count--;
 }
@@ -1801,20 +1809,26 @@ static void end_rwlock_rdwait_v1(PSI_rwl
       The statistics generated are not safe, which is why they are
       just statistics, not facts.
     */
-    PFS_single_stat_chain *stat;
     PFS_rwlock *rwlock= pfs_locker->m_target.m_rwlock;
+    PFS_single_stat_chain *stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class);
+
     if (rwlock->m_readers == 0)
       rwlock->m_last_read= wait->m_timer_end;
     rwlock->m_writer= NULL;
     rwlock->m_readers++;
 
+    /* If timed then aggregate stats, else increment the value counts only */
     if (wait->m_timer_state == TIMER_STATE_TIMED)
     {
       ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
       aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time);
-      stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class);
       aggregate_single_stat_chain(stat, wait_time);
     }
+    else
+    {
+      increment_single_stat_chain(&rwlock->m_wait_stat);
+      increment_single_stat_chain(stat);
+    }
   }
   wait->m_thread->m_wait_locker_count--;
 }
@@ -1854,21 +1868,26 @@ static void end_rwlock_wrwait_v1(PSI_rwl
   if (rc == 0)
   {
     /* Thread safe : we are protected by the instrumented rwlock */
-    PFS_single_stat_chain *stat;
     PFS_rwlock *rwlock= pfs_locker->m_target.m_rwlock;
+    PFS_single_stat_chain *stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class);
     rwlock->m_writer= wait->m_thread;
     rwlock->m_last_written= wait->m_timer_end;
     /* Reset the readers stats, they could be off */
     rwlock->m_readers= 0;
     rwlock->m_last_read= 0;
 
+    /* If timed then aggregate stats, else increment the value counts only */
     if (wait->m_timer_state == TIMER_STATE_TIMED)
     {
       ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
       aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time);
-      stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class);
       aggregate_single_stat_chain(stat, wait_time);
     }
+    else
+    {
+      increment_single_stat_chain(&rwlock->m_wait_stat);
+      increment_single_stat_chain(stat);
+    }
   }
   wait->m_thread->m_wait_locker_count--;
 }
@@ -1922,16 +1941,21 @@ static void end_cond_wait_v1(PSI_cond_lo
       in condition B.
       This is accepted, the data will be slightly inaccurate.
     */
-    PFS_single_stat_chain *stat;
     PFS_cond *cond= pfs_locker->m_target.m_cond;
+    PFS_single_stat_chain *stat= find_per_thread_cond_class_wait_stat(wait->m_thread, cond->m_class);
 
+    /* If timed then aggregate stats, else increment the value counts only */
     if (wait->m_timer_state == TIMER_STATE_TIMED)
     {
       ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
       aggregate_single_stat_chain(&cond->m_wait_stat, wait_time);
-      stat= find_per_thread_cond_class_wait_stat(wait->m_thread, cond->m_class);
       aggregate_single_stat_chain(stat, wait_time);
     }
+    else
+    {
+      increment_single_stat_chain(&cond->m_wait_stat);
+      increment_single_stat_chain(stat);
+    }
   }
   wait->m_thread->m_wait_locker_count--;
 }
@@ -1979,6 +2003,19 @@ static void end_table_wait_v1(PSI_table_
   if (flag_events_waits_history_long)
     insert_events_waits_history_long(wait);
 
+  PFS_table *table= pfs_locker->m_target.m_table;
+
+  /* If timed then aggregate stats, else increment the value counts only */
+  if (wait->m_timer_state == TIMER_STATE_TIMED)
+  {
+    ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
+    aggregate_single_stat_chain(&table->m_wait_stat, wait_time);
+  }
+  else
+  {
+    increment_single_stat_chain(&table->m_wait_stat);
+  }
+
   /*
     There is currently no per table and per thread aggregation.
     The number of tables in the application is arbitrary, and may be high.
@@ -2079,14 +2116,21 @@ static void end_file_wait_v1(PSI_file_lo
   if (flag_events_waits_history_long)
     insert_events_waits_history_long(wait);
 
-  PFS_single_stat_chain *stat;
   PFS_file *file= pfs_locker->m_target.m_file;
+  PFS_single_stat_chain *stat= find_per_thread_file_class_wait_stat(wait->m_thread, file->m_class);
 
-  ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
-  aggregate_single_stat_chain(&file->m_wait_stat, wait_time);
-  stat= find_per_thread_file_class_wait_stat(wait->m_thread,
-                                             file->m_class);
-  aggregate_single_stat_chain(stat, wait_time);
+  /* If timed then aggregate stats, else increment the value counts only */
+  if (wait->m_timer_state == TIMER_STATE_TIMED)
+  {
+    ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
+    aggregate_single_stat_chain(&file->m_wait_stat, wait_time);
+    aggregate_single_stat_chain(stat, wait_time);
+  }
+  else
+  {
+    increment_single_stat_chain(&file->m_wait_stat);
+    increment_single_stat_chain(stat);
+  }
 
   PFS_file_class *klass= file->m_class;
 

=== modified file 'storage/perfschema/pfs_stat.h'
--- a/storage/perfschema/pfs_stat.h	2010-07-16 01:28:30 +0000
+++ b/storage/perfschema/pfs_stat.h	2010-08-26 16:44:02 +0000
@@ -83,6 +83,22 @@ inline void aggregate_single_stat_chain(
   while (stat);
 }
 
+/**
+  Increment the value counts in a statistic chain.
+  Used for instruments that are 'ENABLED' but not 'TIMED'.
+  @param stat                         the aggregated statistic chain
+*/
+inline void increment_single_stat_chain(PFS_single_stat_chain *stat)
+{
+  do
+  {
+    if (*stat->m_control_flag)
+      stat->m_count++;
+    stat= stat->m_parent;
+  }
+  while (stat);
+}
+
 /** Statistics for COND usage. */
 struct PFS_cond_stat
 {


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-\
#   bugfixing/mysql/
# testament_sha1: 6f5fd4f85cc10dcbeaf702dab0d510e20bc479a1
# timestamp: 2010-08-26 11:47:42 -0500
# source_branch: file:///home/cpowers/work/dev/dev-55-bugfixing/mysql/
# base_revision_id: jon.hauglid@stripped\
#   h63yjr0li8fm4n95
# 
# Begin bundle
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


--===============7576153894378252614==--