Commit 03e1e8f1 authored by marko's avatar marko

branches/innodb+: ibuf_t: Remove the unused array n_ops[].

ibuf_print(): Do not print n_ops[].

ibuf_print_ops(): Output trailing newline.
parent 59e74a13
...@@ -1265,8 +1265,8 @@ Print operation counts. The array must be of size IBUF_OP_COUNT. */ ...@@ -1265,8 +1265,8 @@ Print operation counts. The array must be of size IBUF_OP_COUNT. */
static static
void void
ibuf_print_ops( ibuf_print_ops(
/*=========*/ /*===========*/
ulint* ops, /* in: operation counts */ const ulint* ops, /* in: operation counts */
FILE* file) /* in: file where to print */ FILE* file) /* in: file where to print */
{ {
static const char* op_names[] = { static const char* op_names[] = {
...@@ -1282,6 +1282,8 @@ ibuf_print_ops( ...@@ -1282,6 +1282,8 @@ ibuf_print_ops(
fprintf(file, "%s %lu%s", op_names[i], fprintf(file, "%s %lu%s", op_names[i],
(ulong) ops[i], (i < (IBUF_OP_COUNT - 1)) ? ", " : ""); (ulong) ops[i], (i < (IBUF_OP_COUNT - 1)) ? ", " : "");
} }
putc('\n', file);
} }
/************************************************************************ /************************************************************************
...@@ -4082,20 +4084,18 @@ ibuf_print( ...@@ -4082,20 +4084,18 @@ ibuf_print(
mutex_enter(&ibuf_mutex); mutex_enter(&ibuf_mutex);
fprintf(file, fprintf(file,
"Ibuf: size %lu, free list len %lu, seg size %lu, %lu merges\n" "Ibuf: size %lu, free list len %lu,"
"total operations:\n ", " seg size %lu, %lu merges\n",
(ulong) ibuf->size, (ulong) ibuf->size,
(ulong) ibuf->free_list_len, (ulong) ibuf->free_list_len,
(ulong) ibuf->seg_size, (ulong) ibuf->seg_size,
(ulong) ibuf->n_merges); (ulong) ibuf->n_merges);
ibuf_print_ops(ibuf->n_ops, file);
fprintf(file, "\nmerged operations:\n "); fputs("merged operations:\n ", file);
ibuf_print_ops(ibuf->n_merged_ops, file); ibuf_print_ops(ibuf->n_merged_ops, file);
fprintf(file, "\ndiscarded operations:\n "); fputs("discarded operations:\n ", file);
ibuf_print_ops(ibuf->n_discarded_ops, file); ibuf_print_ops(ibuf->n_discarded_ops, file);
fputs("\n", file);
#ifdef UNIV_IBUF_COUNT_DEBUG #ifdef UNIV_IBUF_COUNT_DEBUG
for (i = 0; i < IBUF_COUNT_N_SPACES; i++) { for (i = 0; i < IBUF_COUNT_N_SPACES; i++) {
......
...@@ -37,9 +37,6 @@ struct ibuf_struct{ ...@@ -37,9 +37,6 @@ struct ibuf_struct{
ulint height; /* tree height */ ulint height; /* tree height */
dict_index_t* index; /* insert buffer index */ dict_index_t* index; /* insert buffer index */
ulint n_ops[IBUF_OP_COUNT];
/* number of operations of each type
done */
ulint n_merges; /* number of pages merged */ ulint n_merges; /* number of pages merged */
ulint n_merged_ops[IBUF_OP_COUNT]; ulint n_merged_ops[IBUF_OP_COUNT];
/* number of operations of each type /* number of operations of each type
......
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