database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#53874, "SETUP_INSTRUMENTS.TIMED='NO' should not change TIMER_WAIT in aggregations"

Browse Source 
end_*_wait() functions now honor TIMER_STATE_UNTIMED

storage/perfschema/pfs.cc:
  Don't aggregate stats if TIMER_STATE_UNTIMED
This commit is contained in:
Christopher Powers
2010-08-19 17:24:07 -05:00
parent 9452dd1122
commit 02155b7173
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
storage/perfschema/pfs.cc
View File

@ -1625,7 +1625,7 @@ static void end_mutex_wait_v1(PSI_mutex_locker* locker, int rc)
if (flag_events_waits_history_long) if (flag_events_waits_history_long)
insert_events_waits_history_long(wait); insert_events_waits_history_long(wait);
if (rc == 0) if (rc == 0 && wait->m_timer_state == TIMER_STATE_TIMED)
{ {
/* Thread safe: we are protected by the instrumented mutex */ /* Thread safe: we are protected by the instrumented mutex */
PFS_single_stat_chain *stat; PFS_single_stat_chain *stat;
@ -1635,9 +1635,8 @@ static void end_mutex_wait_v1(PSI_mutex_locker* locker, int rc)
ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; 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(&mutex->m_wait_stat, wait_time);
stat= find_per_thread_mutex_class_wait_stat(wait->m_thread, stat= find_per_thread_mutex_class_wait_stat(wait->m_thread, mutex->m_class);
mutex->m_class); aggregate_single_stat_chain(stat, wait_time);
aggregate_single_stat_chain(stat, wait_time);
} }
wait->m_thread->m_wait_locker_count--; wait->m_thread->m_wait_locker_count--;
} }
@ -1690,11 +1689,13 @@ static void end_rwlock_rdwait_v1(PSI_rwlock_locker* locker, int rc)
rwlock->m_writer= NULL; rwlock->m_writer= NULL;
rwlock->m_readers++; rwlock->m_readers++;
ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; if (wait->m_timer_state == TIMER_STATE_TIMED)
aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time); {
stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
rwlock->m_class); aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time);
aggregate_single_stat_chain(stat, wait_time); stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class);
aggregate_single_stat_chain(stat, wait_time);
}
} }
wait->m_thread->m_wait_locker_count--; wait->m_thread->m_wait_locker_count--;
} }
@ -1742,11 +1743,13 @@ static void end_rwlock_wrwait_v1(PSI_rwlock_locker* locker, int rc)
rwlock->m_readers= 0; rwlock->m_readers= 0;
rwlock->m_last_read= 0; rwlock->m_last_read= 0;
ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; if (wait->m_timer_state == TIMER_STATE_TIMED)
aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time); {
stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
rwlock->m_class); aggregate_single_stat_chain(&rwlock->m_wait_stat, wait_time);
aggregate_single_stat_chain(stat, wait_time); stat= find_per_thread_rwlock_class_wait_stat(wait->m_thread, rwlock->m_class);
aggregate_single_stat_chain(stat, wait_time);
}
} }
wait->m_thread->m_wait_locker_count--; wait->m_thread->m_wait_locker_count--;
} }
@ -1803,11 +1806,13 @@ static void end_cond_wait_v1(PSI_cond_locker* locker, int rc)
PFS_single_stat_chain *stat; PFS_single_stat_chain *stat;
PFS_cond *cond= pfs_locker->m_target.m_cond; PFS_cond *cond= pfs_locker->m_target.m_cond;
ulonglong wait_time= wait->m_timer_end - wait->m_timer_start; if (wait->m_timer_state == TIMER_STATE_TIMED)
aggregate_single_stat_chain(&cond->m_wait_stat, wait_time); {
stat= find_per_thread_cond_class_wait_stat(wait->m_thread, ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
cond->m_class); aggregate_single_stat_chain(&cond->m_wait_stat, wait_time);
aggregate_single_stat_chain(stat, wait_time); stat= find_per_thread_cond_class_wait_stat(wait->m_thread, cond->m_class);
aggregate_single_stat_chain(stat, wait_time);
}
} }
wait->m_thread->m_wait_locker_count--; wait->m_thread->m_wait_locker_count--;
} }
@ -1850,9 +1855,12 @@ static void end_table_wait_v1(PSI_table_locker* locker)
if (flag_events_waits_history_long) if (flag_events_waits_history_long)
insert_events_waits_history_long(wait); insert_events_waits_history_long(wait);
PFS_table *table= pfs_locker->m_target.m_table; 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); PFS_table *table= pfs_locker->m_target.m_table;
ulonglong wait_time= wait->m_timer_end - wait->m_timer_start;
aggregate_single_stat_chain(&table->m_wait_stat, wait_time);
}
/* /*
There is currently no per table and per thread aggregation. There is currently no per table and per thread aggregation.