diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-01-29 13:50:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:22 +0100 |
| commit | 7c58e97bf6f80a251046c5b3e7bce826fe058bd6 (patch) | |
| tree | 7d32d26b320cf83296ee0ede2ea164ad116c4de8 /sql/mdl.cc | |
| parent | 2ac3121af2767186c489054db5d4871d04b8eef4 (diff) | |
| download | mariadb-git-7c58e97bf6f80a251046c5b3e7bce826fe058bd6.tar.gz | |
perfschema memory related instrumentation changes
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index c4d6f89644b..0d6588cd6a4 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -26,6 +26,8 @@ #include <mysql/psi/mysql_stage.h> #include <tpool.h> +static PSI_memory_key key_memory_MDL_context_acquire_locks; + #ifdef HAVE_PSI_INTERFACE static PSI_mutex_key key_MDL_wait_LOCK_wait_status; @@ -50,6 +52,11 @@ static PSI_cond_info all_mdl_conds[]= { &key_MDL_wait_COND_wait_status, "MDL_context::COND_wait_status", 0} }; +static PSI_memory_info all_mdl_memory[]= +{ + { &key_memory_MDL_context_acquire_locks, "MDL_context::acquire_locks", 0} +}; + /** Initialise all the performance schema instrumentation points used by the MDL subsystem. @@ -67,6 +74,9 @@ static void init_mdl_psi_keys(void) count= array_elements(all_mdl_conds); mysql_cond_register("sql", all_mdl_conds, count); + count= array_elements(all_mdl_memory); + mysql_memory_register("sql", all_mdl_memory, count); + MDL_key::init_psi_keys(); } #endif /* HAVE_PSI_INTERFACE */ @@ -2435,8 +2445,8 @@ bool MDL_context::acquire_locks(MDL_request_list *mdl_requests, DBUG_RETURN(FALSE); /* Sort requests according to MDL_key. */ - if (! (sort_buf= (MDL_request **)my_malloc(req_count * - sizeof(MDL_request*), + if (! (sort_buf= (MDL_request **)my_malloc(key_memory_MDL_context_acquire_locks, + req_count * sizeof(MDL_request*), MYF(MY_WME)))) DBUG_RETURN(TRUE); |