cleanup: PSI key is *always* the first argument

10 files changed, 25 insertions, 27 deletions

diff --git a/mysys/array.c b/mysys/array.c
index 20767efdf9e..1d1d9dd1c64 100644
--- a/mysys/array.c
+++ b/mysys/array.c
@@ -40,7 +40,7 @@
     FALSE	Ok
 */
 
-my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, PSI_memory_key psi_key,
+my_bool init_dynamic_array2(PSI_memory_key psi_key, DYNAMIC_ARRAY *array,
                             uint element_size, void *init_buffer,
                             uint init_alloc, uint alloc_increment, myf my_flags)
 {
diff --git a/mysys/hash.c b/mysys/hash.c
index ddb146af5e0..347e0cfda8a 100644
--- a/mysys/hash.c
+++ b/mysys/hash.c
@@ -76,11 +76,11 @@ my_hash_value_type my_hash_sort(CHARSET_INFO *cs, const uchar *key,
     @retval 1 failure
 */
 my_bool
-my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
-              ulong size, size_t key_offset, size_t key_length,
-              my_hash_get_key get_key,
+my_hash_init2(PSI_memory_key psi_key, HASH *hash, uint growth_size,
+              CHARSET_INFO *charset, ulong size, size_t key_offset,
+              size_t key_length, my_hash_get_key get_key,
               my_hash_function hash_function,
-              void (*free_element)(void*), uint flags, PSI_memory_key psi_key)
+              void (*free_element)(void*), uint flags)
 {
   my_bool res;
   DBUG_ENTER("my_hash_init2");
@@ -95,7 +95,7 @@ my_hash_init2(HASH *hash, uint growth_size, CHARSET_INFO *charset,
   hash->free=free_element;
   hash->flags=flags;
   hash->charset=charset;
-  res= init_dynamic_array2(&hash->array, psi_key, sizeof(HASH_LINK), NULL, size,
+  res= init_dynamic_array2(psi_key, &hash->array, sizeof(HASH_LINK), NULL, size,
                            growth_size, MYF((flags & HASH_THREAD_SPECIFIC ?
                                              MY_THREAD_SPECIFIC : 0)));
   DBUG_RETURN(res);
@@ -889,9 +889,8 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
   DBUG_PUSH("d:t:O,/tmp/test_hash.trace");
 
   printf("my_hash_init\n");
-  if (my_hash_init2(&hash_test, 100, &my_charset_bin, 20,
-                    0, 0, (my_hash_get_key) test_get_key, 0, 0, HASH_UNIQUE,
-                    PSI_INSTRUMENT_ME))
+  if (my_hash_init2(PSI_INSTRUMENT_ME, &hash_test, 100, &my_charset_bin, 20,
+                    0, 0, (my_hash_get_key) test_get_key, 0, 0, HASH_UNIQUE))
   {
     fprintf(stderr, "hash init failed\n");
     exit(1);
diff --git a/mysys/ma_dyncol.c b/mysys/ma_dyncol.c
index edd476b4188..b3d3777d922 100644
--- a/mysys/ma_dyncol.c
+++ b/mysys/ma_dyncol.c
@@ -2417,7 +2417,7 @@ dynamic_column_list(DYNAMIC_COLUMN *str, DYNAMIC_ARRAY *array_of_uint)
       str->length)
     return ER_DYNCOL_FORMAT;
 
-  if (my_init_dynamic_array(array_of_uint, PSI_INSTRUMENT_ME,
+  if (my_init_dynamic_array(PSI_INSTRUMENT_ME, array_of_uint,
                             sizeof(uint), header.column_count, 0, MYF(0)))
     return ER_DYNCOL_RESOURCE;
 
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
index 1883c5578f8..d09b307c4c7 100644
--- a/mysys/mf_tempdir.c
+++ b/mysys/mf_tempdir.c
@@ -30,7 +30,7 @@ my_bool init_tmpdir(MY_TMPDIR *tmpdir, const char *pathlist)
   DBUG_PRINT("enter", ("pathlist: %s", pathlist ? pathlist : "NULL"));
 
   mysql_mutex_init(key_TMPDIR_mutex, &tmpdir->mutex, MY_MUTEX_INIT_FAST);
-  if (my_init_dynamic_array(&tmpdir->full_list, key_memory_MY_TMPDIR_full_list,
+  if (my_init_dynamic_array(key_memory_MY_TMPDIR_full_list, &tmpdir->full_list,
                             sizeof(char*), 1, 5, MYF(0)))
     goto err;
   if (!pathlist || !pathlist[0])
diff --git a/mysys/my_default.c b/mysys/my_default.c
index 885bc6449fc..b78de1d9f61 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -416,7 +416,7 @@ int my_load_defaults(const char *conf_file, const char **groups, int *argc,
 
   args_used= get_defaults_options(*argv);
 
-  if (my_init_dynamic_array(&args, key_memory_defaults, sizeof(char*), 128, 64,
+  if (my_init_dynamic_array(key_memory_defaults, &args, sizeof(char*), 128, 64,
                             MYF(0)))
     goto err;
 
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index 14431b3ae73..32fb35fd65b 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.c
@@ -128,7 +128,7 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
                         MYF(MyFlags | MY_ZEROFILL))))
     goto error;
   
-  if (my_init_dynamic_array(&dirh->array, key_memory_MY_DIR, sizeof(FILEINFO),
+  if (my_init_dynamic_array(key_memory_MY_DIR, &dirh->array, sizeof(FILEINFO),
                             ENTRIES_START_SIZE, ENTRIES_INCREMENT,
                             MYF(MyFlags)))
     goto error;
@@ -231,7 +231,7 @@ MY_DIR	*my_dir(const char *path, myf MyFlags)
   if (!(dirh= my_malloc(PSI_INSTRUMENT_ME, sizeof(*dirh), MyFlags | MY_ZEROFILL)))
     goto error;
   
-  if (my_init_dynamic_array(&dirh->array, PSI_INSTRUMENT_ME, sizeof(FILEINFO),
+  if (my_init_dynamic_array(PSI_INSTRUMENT_ME, &dirh->array, sizeof(FILEINFO),
                             ENTRIES_START_SIZE, ENTRIES_INCREMENT,
                             MYF(MyFlags)))
     goto error;
diff --git a/mysys/my_likely.c b/mysys/my_likely.c
index 5b6c781ad06..2ae587be18d 100644
--- a/mysys/my_likely.c
+++ b/mysys/my_likely.c
@@ -48,9 +48,9 @@ HASH likely_hash;
 void init_my_likely()
 {
   /* Allocate big enough to avoid malloc calls */
-  my_hash_init2(&likely_hash, 10000, &my_charset_bin, 1024, 0, 0,
-                (my_hash_get_key) get_likely_key, 0,
-                free, HASH_UNIQUE, PSI_INSTRUMENT_ME);
+  my_hash_init2(PSI_NOT_INSTRUMENTED, &likely_hash, 10000, &my_charset_bin,
+                1024, 0, 0, (my_hash_get_key) get_likely_key, 0, free,
+                HASH_UNIQUE);
   likely_inited= 1;
   pthread_mutex_init(&likely_mutex, MY_MUTEX_INIT_FAST);
 }
diff --git a/mysys/my_safehash.c b/mysys/my_safehash.c
index 39b73d603ef..7d37b707c3a 100644
--- a/mysys/my_safehash.c
+++ b/mysys/my_safehash.c
@@ -100,10 +100,9 @@ my_bool safe_hash_init(SAFE_HASH *hash, uint elements,
                        uchar *default_value)
 {
   DBUG_ENTER("safe_hash_init");
-  if (my_hash_init(&hash->hash, &my_charset_bin, elements,
-                   0, 0, (my_hash_get_key) safe_hash_entry_get,
-                   (void (*)(void*)) safe_hash_entry_free, 0,
-                   key_memory_SAFE_HASH_ENTRY))
+  if (my_hash_init(key_memory_SAFE_HASH_ENTRY, &hash->hash, &my_charset_bin,
+                   elements, 0, 0, (my_hash_get_key) safe_hash_entry_get,
+                   (void (*)(void*)) safe_hash_entry_free, 0))
   {
     hash->default_value= 0;
     DBUG_RETURN(1);
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c
index 1b0ad56a6d5..4f495048f63 100644
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.c
@@ -169,12 +169,12 @@ static int safe_mutex_lazy_init_deadlock_detection(safe_mutex_t *mp)
   pthread_mutex_lock(&THR_LOCK_mutex);
   mp->id= ++safe_mutex_id;
   pthread_mutex_unlock(&THR_LOCK_mutex);
-  my_hash_init2(mp->locked_mutex, 64, &my_charset_bin, 128,
+  my_hash_init2(PSI_NOT_INSTRUMENTED, mp->locked_mutex, 64, &my_charset_bin, 128,
                 offsetof(safe_mutex_deadlock_t, id), sizeof(mp->id), 0, 0, 0,
-                HASH_UNIQUE, PSI_NOT_INSTRUMENTED);
-  my_hash_init2(mp->used_mutex, 64, &my_charset_bin, 128,
+                HASH_UNIQUE);
+  my_hash_init2(PSI_NOT_INSTRUMENTED, mp->used_mutex, 64, &my_charset_bin, 128,
                 offsetof(safe_mutex_t, id), sizeof(mp->id), 0, 0, 0,
-                HASH_UNIQUE, PSI_NOT_INSTRUMENTED);
+                HASH_UNIQUE);
   return 0;
 }
 
diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c
index a930e1d203b..2a97c6133e8 100644
--- a/mysys/waiting_threads.c
+++ b/mysys/waiting_threads.c
@@ -394,7 +394,7 @@ static void wt_resource_create(uchar *arg)
   bzero(rc, sizeof(*rc));
   rc_rwlock_init(rc);
   mysql_cond_init(key_WT_RESOURCE_cond, &rc->cond, 0);
-  my_init_dynamic_array(&rc->owners, PSI_INSTRUMENT_ME,
+  my_init_dynamic_array(PSI_INSTRUMENT_ME, &rc->owners,
                         sizeof(WT_THD *), 0, 5, MYF(0));
   DBUG_VOID_RETURN;
 }
@@ -508,7 +508,7 @@ void wt_thd_lazy_init(WT_THD *thd, const ulong *ds, const ulong *ts,
   thd->deadlock_search_depth_long= dl;
   thd->timeout_long= tl;
   /* dynamic array is also initialized lazily - without memory allocations */
-  my_init_dynamic_array(&thd->my_resources, PSI_INSTRUMENT_ME,
+  my_init_dynamic_array(PSI_INSTRUMENT_ME, &thd->my_resources,
                         sizeof(WT_RESOURCE *), 0, 5, MYF(0));
 #ifndef DBUG_OFF
   thd->name= my_thread_name();