Commit ee321e80 authored by Jimmy Yang's avatar Jimmy Yang

Fix Bug #57600 output of I/O sum[%lu] can go negative

rb://532 approved by Sunny Bains
parent 4184feef
2010-12-09 The InnoDB Team
* buf/buf0lru.c:
Fix Bug#57600 output of I/O sum[%lu] can go negative
2010-11-11 The InnoDB Team 2010-11-11 The InnoDB Team
* thr/thr0loc.c, trx/trx0i_s.c: * thr/thr0loc.c, trx/trx0i_s.c:
Fix Bug#57802 Empty ASSERTION parameter passed to the HASH_SEARCH macro Fix Bug#57802 Empty ASSERTION parameter passed to the HASH_SEARCH macro
......
...@@ -1942,6 +1942,7 @@ buf_LRU_stat_update(void) ...@@ -1942,6 +1942,7 @@ buf_LRU_stat_update(void)
/*=====================*/ /*=====================*/
{ {
buf_LRU_stat_t* item; buf_LRU_stat_t* item;
buf_LRU_stat_t cur_stat;
/* If we haven't started eviction yet then don't update stats. */ /* If we haven't started eviction yet then don't update stats. */
if (buf_pool->freed_page_clock == 0) { if (buf_pool->freed_page_clock == 0) {
...@@ -1955,12 +1956,19 @@ buf_LRU_stat_update(void) ...@@ -1955,12 +1956,19 @@ buf_LRU_stat_update(void)
buf_LRU_stat_arr_ind++; buf_LRU_stat_arr_ind++;
buf_LRU_stat_arr_ind %= BUF_LRU_STAT_N_INTERVAL; buf_LRU_stat_arr_ind %= BUF_LRU_STAT_N_INTERVAL;
/* Add the current value and subtract the obsolete entry. */ /* Add the current value and subtract the obsolete entry.
buf_LRU_stat_sum.io += buf_LRU_stat_cur.io - item->io; Since buf_LRU_stat_cur is not protected by any mutex,
buf_LRU_stat_sum.unzip += buf_LRU_stat_cur.unzip - item->unzip; it can be changing between adding to buf_LRU_stat_sum
and copying to item. Assign it to local variables to make
sure the same value assign to the buf_LRU_stat_sum
and item */
cur_stat = buf_LRU_stat_cur;
buf_LRU_stat_sum.io += cur_stat.io - item->io;
buf_LRU_stat_sum.unzip += cur_stat.unzip - item->unzip;
/* Put current entry in the array. */ /* Put current entry in the array. */
memcpy(item, &buf_LRU_stat_cur, sizeof *item); memcpy(item, &cur_stat, sizeof *item);
buf_pool_mutex_exit(); buf_pool_mutex_exit();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment