summaryrefslogtreecommitdiff
path: root/include/my_alloc.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-01-29 13:50:26 +0100
committerSergei Golubchik <serg@mariadb.org>2020-03-10 19:24:22 +0100
commit7c58e97bf6f80a251046c5b3e7bce826fe058bd6 (patch)
tree7d32d26b320cf83296ee0ede2ea164ad116c4de8 /include/my_alloc.h
parent2ac3121af2767186c489054db5d4871d04b8eef4 (diff)
downloadmariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz
perfschema memory related instrumentation changes
Diffstat (limited to 'include/my_alloc.h')
-rw-r--r--include/my_alloc.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/my_alloc.h b/include/my_alloc.h
index 9b0aad26956..181f637c093 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.h
@@ -20,6 +20,8 @@
#ifndef _my_alloc_h
#define _my_alloc_h
+#include <mysql/psi/psi_memory.h>
+
#define ALLOC_MAX_BLOCK_TO_DROP 4096
#define ALLOC_MAX_BLOCK_USAGE_BEFORE_DROP 10
@@ -43,7 +45,6 @@ typedef struct st_mem_root
/* if block have less memory it will be put in 'used' list */
size_t min_malloc;
size_t block_size; /* initial block size */
- size_t total_alloc;
unsigned int block_num; /* allocated blocks counter */
/*
first free block in queue test counter (if it exceed
@@ -52,7 +53,8 @@ typedef struct st_mem_root
unsigned int first_block_usage;
void (*error_handler)(void);
- const char *name;
+
+ PSI_memory_key m_psi_key;
} MEM_ROOT;
#ifdef __cplusplus