Bug#18991366 SAFE_HASH::MUTEX (MF_KEYCACHES.C) IS NOT INSTRUMENTED

Before this fix, the rwlock used in the SAFE_HASH implementation
was not instrumented for the performance schema.

With this fix, the rwlock is now instrumented.

Also fixed the misleading variable name.

Author: marcalff

mysys/mf_keycaches.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 /*****************************************************************************
   General functions to handle SAFE_HASH objects.
 
-  A SAFE_HASH object is used to store the hash, the mutex and default value
+  A SAFE_HASH object is used to store the hash, the lock and default value
   needed by the rest of the key cache code.
   This is a separate struct to make it easy to later reuse the code for other
   purposes
@@ -53,7 +53,7 @@ typedef struct st_safe_hash_entry
 
 typedef struct st_safe_hash_with_default
 {
-  native_rw_lock_t mutex;
+  mysql_rwlock_t lock;
   HASH hash;
   uchar *default_value;
   SAFE_HASH_ENTRY *root;
@@ -113,7 +113,7 @@ static my_bool safe_hash_init(SAFE_HASH *hash, uint elements,
     hash->default_value= 0;
     DBUG_RETURN(1);
   }
-  native_rw_init(&hash->mutex);
+  mysql_rwlock_init(key_SAFE_HASH_lock, &hash->lock);
   hash->default_value= default_value;
   hash->root= 0;
   DBUG_RETURN(0);
@@ -136,7 +136,7 @@ static void safe_hash_free(SAFE_HASH *hash)
   if (hash->default_value)
   {
     my_hash_free(&hash->hash);
-    native_rw_destroy(&hash->mutex);
+    mysql_rwlock_destroy(&hash->lock);
     hash->default_value=0;
   }
 }
@@ -149,9 +149,9 @@ static uchar *safe_hash_search(SAFE_HASH *hash, const uchar *key, uint length)
 {
   uchar *result;
   DBUG_ENTER("safe_hash_search");
-  native_rw_rdlock(&hash->mutex);
+  mysql_rwlock_rdlock(&hash->lock);
   result= my_hash_search(&hash->hash, key, length);
-  native_rw_unlock(&hash->mutex);
+  mysql_rwlock_unlock(&hash->lock);
   if (!result)
     result= hash->default_value;
   else
@@ -189,7 +189,7 @@ static my_bool safe_hash_set(SAFE_HASH *hash, const uchar *key, uint length,
   DBUG_ENTER("safe_hash_set");
   DBUG_PRINT("enter",("key: %.*s  data: 0x%lx", length, key, (long) data));
 
-  native_rw_wrlock(&hash->mutex);
+  mysql_rwlock_wrlock(&hash->lock);
   entry= (SAFE_HASH_ENTRY*) my_hash_search(&hash->hash, key, length);
 
   if (data == hash->default_value)
@@ -240,7 +240,7 @@ static my_bool safe_hash_set(SAFE_HASH *hash, const uchar *key, uint length,
   }
 
 end:
-  native_rw_unlock(&hash->mutex);
+  mysql_rwlock_unlock(&hash->lock);
   DBUG_RETURN(error);
 }
 
@@ -265,7 +265,7 @@ static void safe_hash_change(SAFE_HASH *hash, uchar *old_data, uchar *new_data)
   SAFE_HASH_ENTRY *entry, *next;
   DBUG_ENTER("safe_hash_set");
 
-  native_rw_wrlock(&hash->mutex);
+  mysql_rwlock_wrlock(&hash->lock);
 
   for (entry= hash->root ; entry ; entry= next)
   {
@@ -283,7 +283,7 @@ static void safe_hash_change(SAFE_HASH *hash, uchar *old_data, uchar *new_data)
     }
   }
 
-  native_rw_unlock(&hash->mutex);
+  mysql_rwlock_unlock(&hash->lock);
   DBUG_VOID_RETURN;
 }
 

mysys/my_init.c

@@ -468,6 +468,13 @@ static PSI_mutex_info all_mysys_mutexes[]=
   { &key_THR_LOCK_myisam_mmap, "THR_LOCK_myisam_mmap", PSI_FLAG_GLOBAL}
 };
 
+PSI_rwlock_key key_SAFE_HASH_lock;
+
+static PSI_rwlock_info all_mysys_rwlocks[]=
+{
+  { &key_SAFE_HASH_lock, "SAFE_HASH::lock", 0}
+};
+
 PSI_cond_key key_IO_CACHE_SHARE_cond,
   key_IO_CACHE_SHARE_cond_writer, key_my_thread_var_suspend,
   key_THR_COND_threads;
@@ -540,6 +547,9 @@ void my_init_mysys_psi_keys()
   count= sizeof(all_mysys_mutexes)/sizeof(all_mysys_mutexes[0]);
   mysql_mutex_register(category, all_mysys_mutexes, count);
 
+  count= sizeof(all_mysys_rwlocks)/sizeof(all_mysys_rwlocks[0]);
+  mysql_rwlock_register(category, all_mysys_rwlocks, count);
+
   count= sizeof(all_mysys_conds)/sizeof(all_mysys_conds[0]);
   mysql_cond_register(category, all_mysys_conds, count);
 

mysys/mysys_priv.h

@@ -34,6 +34,8 @@ extern PSI_mutex_key key_BITMAP_mutex, key_IO_CACHE_append_buffer_lock,
   key_THR_LOCK_open, key_THR_LOCK_threads,
   key_TMPDIR_mutex, key_THR_LOCK_myisam_mmap;
 
+extern PSI_rwlock_key key_SAFE_HASH_lock;
+
 extern PSI_cond_key key_IO_CACHE_SHARE_cond,
   key_IO_CACHE_SHARE_cond_writer, key_my_thread_var_suspend,
   key_THR_COND_threads;