summaryrefslogtreecommitdiff
path: root/storage/innobase/srv
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/srv')
-rw-r--r--storage/innobase/srv/srv0mon.cc32
-rw-r--r--storage/innobase/srv/srv0srv.cc44
-rw-r--r--storage/innobase/srv/srv0start.cc9
3 files changed, 41 insertions, 44 deletions
diff --git a/storage/innobase/srv/srv0mon.cc b/storage/innobase/srv/srv0mon.cc
index f34680b9aed..017c5da0353 100644
--- a/storage/innobase/srv/srv0mon.cc
+++ b/storage/innobase/srv/srv0mon.cc
@@ -1631,7 +1631,7 @@ srv_mon_process_existing_counter(
/* innodb_buffer_pool_read_requests, the number of logical
read requests */
case MONITOR_OVLD_BUF_POOL_READ_REQUESTS:
- value = buf_pool->stat.n_page_gets;
+ value = buf_pool.stat.n_page_gets;
break;
/* innodb_buffer_pool_write_requests, the number of
@@ -1647,61 +1647,61 @@ srv_mon_process_existing_counter(
/* innodb_buffer_pool_read_ahead */
case MONITOR_OVLD_BUF_POOL_READ_AHEAD:
- value = buf_pool->stat.n_ra_pages_read;
+ value = buf_pool.stat.n_ra_pages_read;
break;
/* innodb_buffer_pool_read_ahead_evicted */
case MONITOR_OVLD_BUF_POOL_READ_AHEAD_EVICTED:
- value = buf_pool->stat.n_ra_pages_evicted;
+ value = buf_pool.stat.n_ra_pages_evicted;
break;
/* innodb_buffer_pool_pages_total */
case MONITOR_OVLD_BUF_POOL_PAGE_TOTAL:
- value = buf_pool_get_n_pages();
+ value = buf_pool.get_n_pages();
break;
/* innodb_buffer_pool_pages_misc */
case MONITOR_OVLD_BUF_POOL_PAGE_MISC:
- value = buf_pool_get_n_pages()
- - UT_LIST_GET_LEN(buf_pool->LRU)
- - UT_LIST_GET_LEN(buf_pool->free);
+ value = buf_pool.get_n_pages()
+ - UT_LIST_GET_LEN(buf_pool.LRU)
+ - UT_LIST_GET_LEN(buf_pool.free);
break;
/* innodb_buffer_pool_pages_data */
case MONITOR_OVLD_BUF_POOL_PAGES_DATA:
- value = UT_LIST_GET_LEN(buf_pool->LRU);
+ value = UT_LIST_GET_LEN(buf_pool.LRU);
break;
/* innodb_buffer_pool_bytes_data */
case MONITOR_OVLD_BUF_POOL_BYTES_DATA:
- value = buf_pool->stat.LRU_bytes
- + (UT_LIST_GET_LEN(buf_pool->unzip_LRU)
+ value = buf_pool.stat.LRU_bytes
+ + (UT_LIST_GET_LEN(buf_pool.unzip_LRU)
<< srv_page_size_shift);
break;
/* innodb_buffer_pool_pages_dirty */
case MONITOR_OVLD_BUF_POOL_PAGES_DIRTY:
- value = UT_LIST_GET_LEN(buf_pool->flush_list);
+ value = UT_LIST_GET_LEN(buf_pool.flush_list);
break;
/* innodb_buffer_pool_bytes_dirty */
case MONITOR_OVLD_BUF_POOL_BYTES_DIRTY:
- value = buf_pool->stat.flush_list_bytes;
+ value = buf_pool.stat.flush_list_bytes;
break;
/* innodb_buffer_pool_pages_free */
case MONITOR_OVLD_BUF_POOL_PAGES_FREE:
- value = UT_LIST_GET_LEN(buf_pool->free);
+ value = UT_LIST_GET_LEN(buf_pool.free);
break;
/* innodb_pages_created, the number of pages created */
case MONITOR_OVLD_PAGE_CREATED:
- value = buf_pool->stat.n_pages_created;
+ value = buf_pool.stat.n_pages_created;
break;
/* innodb_pages_written, the number of page written */
case MONITOR_OVLD_PAGES_WRITTEN:
- value = buf_pool->stat.n_pages_written;
+ value = buf_pool.stat.n_pages_written;
break;
/* innodb_index_pages_written, the number of index pages written */
@@ -1716,7 +1716,7 @@ srv_mon_process_existing_counter(
/* innodb_pages_read */
case MONITOR_OVLD_PAGES_READ:
- value = buf_pool->stat.n_pages_read;
+ value = buf_pool.stat.n_pages_read;
break;
/* Number of times secondary index lookup triggered cluster lookup */
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index 6b6506a8b01..1a0bfb39523 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -207,7 +207,7 @@ const ulint srv_buf_pool_def_size = 128 * 1024 * 1024;
/** Requested buffer pool chunk size */
ulong srv_buf_pool_chunk_unit;
/** innodb_page_hash_locks (a debug-only parameter);
-number of locks to protect buf_pool->page_hash */
+number of locks to protect buf_pool.page_hash */
ulong srv_n_page_hash_locks = 16;
/** innodb_lru_scan_depth; number of blocks scanned in LRU flush batch */
ulong srv_LRU_scan_depth;
@@ -972,7 +972,7 @@ srv_printf_innodb_monitor(
const hash_table_t* table = btr_search_sys->hash_tables[i];
ut_ad(table->magic_n == HASH_TABLE_MAGIC_N);
- /* this is only used for buf_pool->page_hash */
+ /* this is only used for buf_pool.page_hash */
ut_ad(!table->heaps);
/* this is used for the adaptive hash index */
ut_ad(table->heap);
@@ -1173,7 +1173,7 @@ srv_export_innodb_status(void)
export_vars.innodb_data_written = srv_stats.data_written;
export_vars.innodb_buffer_pool_read_requests
- = buf_pool->stat.n_page_gets;
+ = buf_pool.stat.n_page_gets;
export_vars.innodb_buffer_pool_write_requests =
srv_stats.buf_pool_write_requests;
@@ -1187,48 +1187,48 @@ srv_export_innodb_status(void)
export_vars.innodb_buffer_pool_reads = srv_stats.buf_pool_reads;
export_vars.innodb_buffer_pool_read_ahead_rnd =
- buf_pool->stat.n_ra_pages_read_rnd;
+ buf_pool.stat.n_ra_pages_read_rnd;
export_vars.innodb_buffer_pool_read_ahead =
- buf_pool->stat.n_ra_pages_read;
+ buf_pool.stat.n_ra_pages_read;
export_vars.innodb_buffer_pool_read_ahead_evicted =
- buf_pool->stat.n_ra_pages_evicted;
+ buf_pool.stat.n_ra_pages_evicted;
export_vars.innodb_buffer_pool_pages_data =
- UT_LIST_GET_LEN(buf_pool->LRU);
+ UT_LIST_GET_LEN(buf_pool.LRU);
export_vars.innodb_buffer_pool_bytes_data =
- buf_pool->stat.LRU_bytes
- + (UT_LIST_GET_LEN(buf_pool->unzip_LRU)
+ buf_pool.stat.LRU_bytes
+ + (UT_LIST_GET_LEN(buf_pool.unzip_LRU)
<< srv_page_size_shift);
export_vars.innodb_buffer_pool_pages_dirty =
- UT_LIST_GET_LEN(buf_pool->flush_list);
+ UT_LIST_GET_LEN(buf_pool.flush_list);
export_vars.innodb_buffer_pool_pages_made_young
- = buf_pool->stat.n_pages_made_young;
+ = buf_pool.stat.n_pages_made_young;
export_vars.innodb_buffer_pool_pages_made_not_young
- = buf_pool->stat.n_pages_not_made_young;
+ = buf_pool.stat.n_pages_not_made_young;
- export_vars.innodb_buffer_pool_pages_old = buf_pool->LRU_old_len;
+ export_vars.innodb_buffer_pool_pages_old = buf_pool.LRU_old_len;
export_vars.innodb_buffer_pool_bytes_dirty =
- buf_pool->stat.flush_list_bytes;
+ buf_pool.stat.flush_list_bytes;
export_vars.innodb_buffer_pool_pages_free =
- UT_LIST_GET_LEN(buf_pool->free);
+ UT_LIST_GET_LEN(buf_pool.free);
#ifdef UNIV_DEBUG
export_vars.innodb_buffer_pool_pages_latched =
buf_get_latched_pages_number();
#endif /* UNIV_DEBUG */
- export_vars.innodb_buffer_pool_pages_total = buf_pool_get_n_pages();
+ export_vars.innodb_buffer_pool_pages_total = buf_pool.get_n_pages();
export_vars.innodb_buffer_pool_pages_misc =
- buf_pool_get_n_pages()
- - UT_LIST_GET_LEN(buf_pool->LRU)
- - UT_LIST_GET_LEN(buf_pool->free);
+ buf_pool.get_n_pages()
+ - UT_LIST_GET_LEN(buf_pool.LRU)
+ - UT_LIST_GET_LEN(buf_pool.free);
export_vars.innodb_max_trx_id = trx_sys.get_max_trx_id();
export_vars.innodb_history_list_length = trx_sys.rseg_history_len;
@@ -1254,11 +1254,11 @@ srv_export_innodb_status(void)
export_vars.innodb_dblwr_writes = srv_stats.dblwr_writes;
- export_vars.innodb_pages_created = buf_pool->stat.n_pages_created;
+ export_vars.innodb_pages_created = buf_pool.stat.n_pages_created;
- export_vars.innodb_pages_read = buf_pool->stat.n_pages_read;
+ export_vars.innodb_pages_read = buf_pool.stat.n_pages_read;
- export_vars.innodb_pages_written = buf_pool->stat.n_pages_written;
+ export_vars.innodb_pages_written = buf_pool.stat.n_pages_written;
export_vars.innodb_row_lock_waits = srv_stats.n_lock_wait_count;
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index c4bc50dd93a..ecfcc499004 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -1308,7 +1308,7 @@ dberr_t srv_start(bool create_new_db)
<< srv_buf_pool_size
<< ", chunk size = " << srv_buf_pool_chunk_unit;
- if (buf_pool_init()) {
+ if (buf_pool.create()) {
ib::error() << "Cannot allocate memory for the buffer pool";
return(srv_init_abort(DB_ERROR));
@@ -2172,11 +2172,8 @@ void innodb_shutdown()
pars_lexer_close();
recv_sys.close();
- ut_ad(buf_pool || !srv_was_started);
- if (buf_pool) {
- buf_pool_free();
- }
-
+ ut_ad(buf_pool.is_initialised() || !srv_was_started);
+ buf_pool.close();
sync_check_close();
if (srv_was_started && srv_print_verbose_log) {
View Lorry Controller Status