WL#2360 Performance schema

Part 1: Instrumentation interface

1 files changed, 884 insertions, 0 deletions

diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h
new file mode 100644
index 00000000000..18c4daa0cf2
--- /dev/null
+++ b/include/mysql/psi/mysql_thread.h
@@ -0,0 +1,884 @@
+/* Copyright (C) 2008-2009 Sun Microsystems, Inc
+
+  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
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#ifndef MYSQL_THREAD_H
+#define MYSQL_THREAD_H
+
+/**
+  @file mysql/psi/mysql_thread.h
+  Instrumentation helpers for mysys threads, mutexes,
+  read write locks and conditions.
+  This header file provides the necessary declarations
+  to use the mysys thread API with the performance schema instrumentation.
+  In some compilers (SunStudio), 'static inline' functions, when declared
+  but not used, are not optimized away (because they are unused) by default,
+  so that including a static inline function from a header file does
+  create unwanted dependencies, causing unresolved symbols at link time.
+  Other compilers, like gcc, optimize these dependencies by default.
+
+  Since the instrumented APIs declared here are wrapper on top
+  of my_pthread / safemutex / etc APIs,
+  including mysql/psi/mysql_thread.h assumes that
+  the dependency on my_pthread and safemutex already exists.
+*/
+/*
+  Note: there are several orthogonal dimensions here.
+
+  Dimension 1: Instrumentation
+  HAVE_PSI_INTERFACE is defined when the instrumentation is compiled in.
+  This may happen both in debug or production builds.
+
+  Dimension 2: Debug
+  SAFE_MUTEX is defined when debug is compiled in.
+  This may happen both with and without instrumentation.
+
+  Dimension 3: Platform
+  Mutexes are implemented with one of:
+  - the pthread library
+  - fast mutexes
+  - window apis
+  This is implemented by various macro definitions in my_pthread.h
+
+  This causes complexity with '#ifdef'-ery that can't be avoided.
+*/
+
+#include "mysql/psi/psi.h"
+
+/**
+  @defgroup Thread_instrumentation Thread Instrumentation
+  @ingroup Instrumentation_interface
+  @{
+*/
+
+/**
+  An instrumented mutex structure.
+  @sa mysql_mutex_t
+*/
+struct st_mysql_mutex
+{
+  /** The real mutex. */
+  pthread_mutex_t m_mutex;
+  /**
+    The instrumentation hook.
+    Note that this hook is not conditionally defined,
+    for binary compatibility of the @c mysql_mutex_t interface.
+  */
+  struct PSI_mutex *m_psi;
+};
+
+/**
+  Type of an instrumented mutex.
+  @c mysql_mutex_t is a drop-in replacement for @c pthread_mutex_t.
+  @sa mysql_mutex_assert_owner
+  @sa mysql_mutex_assert_not_owner
+  @sa mysql_mutex_init
+  @sa mysql_mutex_lock
+  @sa mysql_mutex_unlock
+  @sa mysql_mutex_destroy
+*/
+typedef struct st_mysql_mutex mysql_mutex_t;
+
+/**
+  An instrumented rwlock structure.
+  @sa mysql_rwlock_t
+*/
+struct st_mysql_rwlock
+{
+  /** The real rwlock */
+  rw_lock_t m_rwlock;
+  /**
+    The instrumentation hook.
+    Note that this hook is not conditionally defined,
+    for binary compatibility of the @c mysql_rwlock_t interface.
+  */
+  struct PSI_rwlock *m_psi;
+};
+
+/**
+  Type of an instrumented rwlock.
+  @c mysql_rwlock_t is a drop-in replacement for @c pthread_rwlock_t.
+  @sa mysql_rwlock_init
+  @sa mysql_rwlock_rdlock
+  @sa mysql_rwlock_tryrdlock
+  @sa mysql_rwlock_wrlock
+  @sa mysql_rwlock_trywrlock
+  @sa mysql_rwlock_unlock
+  @sa mysql_rwlock_destroy
+*/
+typedef struct st_mysql_rwlock mysql_rwlock_t;
+
+/**
+  An instrumented cond structure.
+  @sa mysql_cond_t
+*/
+struct st_mysql_cond
+{
+  /** The real condition */
+  pthread_cond_t m_cond;
+  /**
+    The instrumentation hook.
+    Note that this hook is not conditionally defined,
+    for binary compatibility of the @c mysql_cond_t interface.
+  */
+  struct PSI_cond *m_psi;
+};
+
+/**
+  Type of an instrumented condition.
+  @c mysql_cond_t is a drop-in replacement for @c pthread_cond_t.
+  @sa mysql_cond_init
+  @sa mysql_cond_wait
+  @sa mysql_cond_timedwait
+  @sa mysql_cond_signal
+  @sa mysql_cond_broadcast
+  @sa mysql_cond_destroy
+*/
+typedef struct st_mysql_cond mysql_cond_t;
+
+/*
+  Consider the following code:
+    static inline void foo() { bar(); }
+  when foo() is never called.
+
+  With gcc, foo() is a local static function, so the dependencies
+  are optimized away at compile time, and there is no dependency on bar().
+  With other compilers (HP, Sun Studio), the function foo() implementation
+  is compiled, and bar() needs to be present to link.
+
+  Due to the existing header dependencies in MySQL code, this header file
+  is sometime used when it is not needed, which in turn cause link failures
+  on some platforms.
+  The proper fix would be to cut these extra dependencies in the calling code.
+  DISABLE_MYSQL_THREAD_H is a work around to limit dependencies.
+*/
+#ifndef DISABLE_MYSQL_THREAD_H
+
+/**
+  @def mysql_mutex_assert_owner(M)
+  Wrapper, to use safe_mutex_assert_owner with instrumented mutexes.
+  @c mysql_mutex_assert_owner is a drop-in replacement
+  for @c safe_mutex_assert_owner.
+*/
+#define mysql_mutex_assert_owner(M) \
+  safe_mutex_assert_owner(&(M)->m_mutex)
+
+/**
+  @def mysql_mutex_assert_not_owner(M)
+  Wrapper, to use safe_mutex_assert_not_owner with instrumented mutexes.
+  @c mysql_mutex_assert_not_owner is a drop-in replacement
+  for @c safe_mutex_assert_not_owner.
+*/
+#define mysql_mutex_assert_not_owner(M) \
+  safe_mutex_assert_not_owner(&(M)->m_mutex)
+
+/**
+  @def mysql_mutex_init(K, M, A)
+  Instrumented mutex_init.
+  @c mysql_mutex_init is a replacement for @c pthread_mutex_init.
+  @param K The PSI_mutex_key for this instrumented mutex
+  @param M The mutex to initialize
+  @param A Mutex attributes
+*/
+
+#ifdef HAVE_PSI_INTERFACE
+  #ifdef SAFE_MUTEX
+    #define mysql_mutex_init(K, M, A) \
+      inline_mysql_mutex_init(K, M, A, __FILE__, __LINE__)
+  #else
+    #define mysql_mutex_init(K, M, A) \
+      inline_mysql_mutex_init(K, M, A)
+  #endif
+#else
+  #ifdef SAFE_MUTEX
+    #define mysql_mutex_init(K, M, A) \
+      inline_mysql_mutex_init(M, A, __FILE__, __LINE__)
+  #else
+    #define mysql_mutex_init(K, M, A) \
+      inline_mysql_mutex_init(M, A)
+  #endif
+#endif
+
+/**
+  @def mysql_mutex_destroy(M)
+  Instrumented mutex_destroy.
+  @c mysql_mutex_destroy is a drop-in replacement
+  for @c pthread_mutex_destroy.
+*/
+#ifdef SAFE_MUTEX
+  #define mysql_mutex_destroy(M) \
+    inline_mysql_mutex_destroy(M, __FILE__, __LINE__)
+#else
+  #define mysql_mutex_destroy(M) \
+    inline_mysql_mutex_destroy(M)
+#endif
+
+/**
+  @def mysql_mutex_lock(M)
+  Instrumented mutex_lock.
+  @c mysql_mutex_lock is a drop-in replacement for @c pthread_mutex_lock.
+  @param M The mutex to lock
+*/
+
+#if defined(SAFE_MUTEX) || defined (HAVE_PSI_INTERFACE)
+  #define mysql_mutex_lock(M) \
+    inline_mysql_mutex_lock(M, __FILE__, __LINE__)
+#else
+  #define mysql_mutex_lock(M) \
+    inline_mysql_mutex_lock(M)
+#endif
+
+/**
+  @def mysql_mutex_trylock(M)
+  Instrumented mutex_lock.
+  @c mysql_mutex_trylock is a drop-in replacement
+  for @c pthread_mutex_trylock.
+*/
+
+#if defined(SAFE_MUTEX) || defined (HAVE_PSI_INTERFACE)
+  #define mysql_mutex_trylock(M) \
+    inline_mysql_mutex_trylock(M, __FILE__, __LINE__)
+#else
+  #define mysql_mutex_trylock(M) \
+    inline_mysql_mutex_trylock(M)
+#endif
+
+/**
+  @def mysql_mutex_unlock(M)
+  Instrumented mutex_unlock.
+  @c mysql_mutex_unlock is a drop-in replacement for @c pthread_mutex_unlock.
+*/
+#ifdef SAFE_MUTEX
+  #define mysql_mutex_unlock(M) \
+    inline_mysql_mutex_unlock(M, __FILE__, __LINE__)
+#else
+  #define mysql_mutex_unlock(M) \
+    inline_mysql_mutex_unlock(M)
+#endif
+
+/**
+  @def mysql_rwlock_init(K, RW)
+  Instrumented rwlock_init.
+  @c mysql_rwlock_init is a replacement for @c pthread_rwlock_init.
+  Note that pthread_rwlockattr_t is not supported in MySQL.
+  @param K The PSI_rwlock_key for this instrumented rwlock
+  @param RW The rwlock to initialize
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_rwlock_init(K, RW) inline_mysql_rwlock_init(K, RW)
+#else
+  #define mysql_rwlock_init(K, RW) inline_mysql_rwlock_init(RW)
+#endif
+
+/**
+  @def mysql_rwlock_destroy(RW)
+  Instrumented rwlock_destroy.
+  @c mysql_rwlock_destroy is a drop-in replacement
+  for @c pthread_rwlock_destroy.
+*/
+#define mysql_rwlock_destroy(RW) inline_mysql_rwlock_destroy(RW)
+
+/**
+  @def mysql_rwlock_rdlock(RW)
+  Instrumented rwlock_rdlock.
+  @c mysql_rwlock_rdlock is a drop-in replacement
+  for @c pthread_rwlock_rdlock.
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_rwlock_rdlock(RW) \
+    inline_mysql_rwlock_rdlock(RW, __FILE__, __LINE__)
+#else
+  #define mysql_rwlock_rdlock(RW) \
+    inline_mysql_rwlock_rdlock(RW)
+#endif
+
+/**
+  @def mysql_rwlock_wrlock(RW)
+  Instrumented rwlock_wrlock.
+  @c mysql_rwlock_wrlock is a drop-in replacement
+  for @c pthread_rwlock_wrlock.
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_rwlock_wrlock(RW) \
+    inline_mysql_rwlock_wrlock(RW, __FILE__, __LINE__)
+#else
+  #define mysql_rwlock_wrlock(RW) \
+    inline_mysql_rwlock_wrlock(RW)
+#endif
+
+/**
+  @def mysql_rwlock_tryrdlock(RW)
+  Instrumented rwlock_tryrdlock.
+  @c mysql_rwlock_tryrdlock is a drop-in replacement
+  for @c pthread_rwlock_tryrdlock.
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_rwlock_tryrdlock(RW) \
+    inline_mysql_rwlock_tryrdlock(RW, __FILE__, __LINE__)
+#else
+  #define mysql_rwlock_tryrdlock(RW) \
+    inline_mysql_rwlock_tryrdlock(RW)
+#endif
+
+/**
+  @def mysql_rwlock_trywrlock(RW)
+  Instrumented rwlock_trywrlock.
+  @c mysql_rwlock_trywrlock is a drop-in replacement
+  for @c pthread_rwlock_trywrlock.
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_rwlock_trywrlock(RW) \
+    inline_mysql_rwlock_trywrlock(RW, __FILE__, __LINE__)
+#else
+  #define mysql_rwlock_trywrlock(RW) \
+    inline_mysql_rwlock_trywrlock(RW)
+#endif
+
+/**
+  @def mysql_rwlock_unlock(RW)
+  Instrumented rwlock_unlock.
+  @c mysql_rwlock_unlock is a drop-in replacement
+  for @c pthread_rwlock_unlock.
+*/
+#define mysql_rwlock_unlock(RW) inline_mysql_rwlock_unlock(RW)
+
+/**
+  @def mysql_cond_init(K, C, A)
+  Instrumented rwlock_init.
+  @c mysql_cond_init is a replacement for @c pthread_cond_init.
+  @param C The cond to initialize
+  @param K The PSI_cond_key for this instrumented cond
+  @param A Condition attributes
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_cond_init(K, C, A) inline_mysql_cond_init(K, C, A)
+#else
+  #define mysql_cond_init(K, C, A) inline_mysql_cond_init(C, A)
+#endif
+
+/**
+  @def mysql_cond_destroy(C)
+  Instrumented cond_destroy.
+  @c mysql_cond_destroy is a drop-in replacement for @c pthread_cond_destroy.
+*/
+#define mysql_cond_destroy(C) inline_mysql_cond_destroy(C)
+
+/**
+  @def mysql_cond_wait(C)
+  Instrumented cond_wait.
+  @c mysql_cond_wait is a drop-in replacement for @c pthread_cond_wait.
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_cond_wait(C, M) \
+    inline_mysql_cond_wait(C, M, __FILE__, __LINE__)
+#else
+  #define mysql_cond_wait(C, M) \
+    inline_mysql_cond_wait(C, M)
+#endif
+
+/**
+  @def mysql_cond_timedwait(C, M, W)
+  Instrumented cond_timedwait.
+  @c mysql_cond_timedwait is a drop-in replacement
+  for @c pthread_cond_timedwait.
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_cond_timedwait(C, M, W) \
+    inline_mysql_cond_timedwait(C, M, W, __FILE__, __LINE__)
+#else
+  #define mysql_cond_timedwait(C, M, W) \
+    inline_mysql_cond_timedwait(C, M, W)
+#endif
+
+/**
+  @def mysql_cond_signal(C)
+  Instrumented cond_signal.
+  @c mysql_cond_signal is a drop-in replacement for @c pthread_cond_signal.
+*/
+#define mysql_cond_signal(C) inline_mysql_cond_signal(C)
+
+/**
+  @def mysql_cond_broadcast(C)
+  Instrumented cond_broadcast.
+  @c mysql_cond_broadcast is a drop-in replacement
+  for @c pthread_cond_broadcast.
+*/
+#define mysql_cond_broadcast(C) inline_mysql_cond_broadcast(C)
+
+
+/**
+  @def mysql_thread_create(K, P1, P2, P3, P4)
+  Instrumented pthread_create.
+  This function creates both the thread instrumentation and a thread.
+  @c mysql_thread_create is a replacement for @c pthread_create.
+  The parameter P4 (or, if it is NULL, P1) will be used as the
+  instrumented thread "indentity".
+  Providing a P1 / P4 parameter with a different value for each call
+  will on average improve performances, since this thread identity value
+  is used internally to randomize access to data and prevent contention.
+  This is optional, and the improvement is not guaranteed, only statistical.
+  @param K The PSI_thread_key for this instrumented thread
+  @param P1 pthread_create parameter 1
+  @param P2 pthread_create parameter 2
+  @param P3 pthread_create parameter 3
+  @param P4 pthread_create parameter 4
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_thread_create(K, P1, P2, P3, P4) \
+    inline_mysql_thread_create(K, P1, P2, P3, P4)
+#else
+  #define mysql_thread_create(K, P1, P2, P3, P4) \
+    pthread_create(P1, P2, P3, P4)
+#endif
+
+/**
+  @def mysql_thread_set_psi_id(I)
+  Set the thread indentifier for the instrumentation.
+  @param I The thread identifier
+*/
+#ifdef HAVE_PSI_INTERFACE
+  #define mysql_thread_set_psi_id(I) inline_mysql_thread_set_psi_id(I)
+#else
+  #define mysql_thread_set_psi_id(I) do {} while (0)
+#endif
+
+static inline int inline_mysql_mutex_init(
+#ifdef HAVE_PSI_INTERFACE
+  PSI_mutex_key key,
+#endif
+  mysql_mutex_t *that,
+  const pthread_mutexattr_t *attr
+#ifdef SAFE_MUTEX
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+#ifdef HAVE_PSI_INTERFACE
+  that->m_psi= PSI_server ? PSI_server->init_mutex(key, &that->m_mutex)
+                          : NULL;
+#else
+  that->m_psi= NULL;
+#endif
+#ifdef SAFE_MUTEX
+  return safe_mutex_init(&that->m_mutex, attr, src_file, src_line);
+#else
+  return pthread_mutex_init(&that->m_mutex, attr);
+#endif
+}
+
+static inline int inline_mysql_mutex_destroy(
+  mysql_mutex_t *that
+#ifdef SAFE_MUTEX
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(PSI_server && that->m_psi))
+  {
+    PSI_server->destroy_mutex(that->m_psi);
+    that->m_psi= NULL;
+  }
+#endif
+#ifdef SAFE_MUTEX
+  return safe_mutex_destroy(&that->m_mutex, src_file, src_line);
+#else
+  return pthread_mutex_destroy(&that->m_mutex);
+#endif
+}
+
+static inline int inline_mysql_mutex_lock(
+  mysql_mutex_t *that
+#if defined(SAFE_MUTEX) || defined (HAVE_PSI_INTERFACE)
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_mutex_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_mutex_locker(that->m_psi, PSI_MUTEX_LOCK);
+    if (likely(locker != NULL))
+      PSI_server->start_mutex_wait(locker, src_file, src_line);
+  }
+#endif
+#ifdef SAFE_MUTEX
+  result= safe_mutex_lock(&that->m_mutex, FALSE, src_file, src_line);
+#else
+  result= pthread_mutex_lock(&that->m_mutex);
+#endif
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_mutex_wait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_mutex_trylock(
+  mysql_mutex_t *that
+#if defined(SAFE_MUTEX) || defined (HAVE_PSI_INTERFACE)
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_mutex_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_mutex_locker(that->m_psi, PSI_MUTEX_TRYLOCK);
+    if (likely(locker != NULL))
+      PSI_server->start_mutex_wait(locker, src_file, src_line);
+  }
+#endif
+#ifdef SAFE_MUTEX
+  result= safe_mutex_lock(&that->m_mutex, TRUE, src_file, src_line);
+#else
+  result= pthread_mutex_trylock(&that->m_mutex);
+#endif
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_mutex_wait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_mutex_unlock(
+  mysql_mutex_t *that
+#ifdef SAFE_MUTEX
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_thread *thread;
+  if (likely(PSI_server && that->m_psi))
+  {
+    thread= PSI_server->get_thread();
+    if (likely(thread != NULL))
+      PSI_server->unlock_mutex(thread, that->m_psi);
+  }
+#endif
+#ifdef SAFE_MUTEX
+  result= safe_mutex_unlock(&that->m_mutex, src_file, src_line);
+#else
+  result= pthread_mutex_unlock(&that->m_mutex);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_rwlock_init(
+#ifdef HAVE_PSI_INTERFACE
+  PSI_rwlock_key key,
+#endif
+  mysql_rwlock_t *that)
+{
+#ifdef HAVE_PSI_INTERFACE
+  that->m_psi= (PSI_server ? PSI_server->init_rwlock(key, &that->m_rwlock)
+                           : NULL);
+#else
+  that->m_psi= NULL;
+#endif
+  /*
+    pthread_rwlockattr_t is not used in MySQL.
+  */
+  return my_rwlock_init(&that->m_rwlock, NULL);
+}
+
+static inline int inline_mysql_rwlock_destroy(
+  mysql_rwlock_t *that)
+{
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(PSI_server && that->m_psi))
+  {
+    PSI_server->destroy_rwlock(that->m_psi);
+    that->m_psi= NULL;
+  }
+#endif
+  return rwlock_destroy(&that->m_rwlock);
+}
+
+static inline int inline_mysql_rwlock_rdlock(
+  mysql_rwlock_t *that
+#ifdef HAVE_PSI_INTERFACE
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_rwlock_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_rwlock_locker(that->m_psi,
+                                                 PSI_RWLOCK_READLOCK);
+    if (likely(locker != NULL))
+      PSI_server->start_rwlock_rdwait(locker, src_file, src_line);
+  }
+#endif
+  result= rw_rdlock(&that->m_rwlock);
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_rwlock_rdwait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_rwlock_wrlock(
+  mysql_rwlock_t *that
+#ifdef HAVE_PSI_INTERFACE
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_rwlock_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_rwlock_locker(that->m_psi,
+                                                 PSI_RWLOCK_WRITELOCK);
+    if (likely(locker != NULL))
+      PSI_server->start_rwlock_wrwait(locker, src_file, src_line);
+  }
+#endif
+  result= rw_wrlock(&that->m_rwlock);
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_rwlock_wrwait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_rwlock_tryrdlock(
+  mysql_rwlock_t *that
+#ifdef HAVE_PSI_INTERFACE
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_rwlock_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_rwlock_locker(that->m_psi,
+                                                 PSI_RWLOCK_TRYREADLOCK);
+    if (likely(locker != NULL))
+      PSI_server->start_rwlock_rdwait(locker, src_file, src_line);
+  }
+#endif
+  result= rw_tryrdlock(&that->m_rwlock);
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_rwlock_rdwait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_rwlock_trywrlock(
+  mysql_rwlock_t *that
+#ifdef HAVE_PSI_INTERFACE
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_rwlock_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_rwlock_locker(that->m_psi,
+                                                 PSI_RWLOCK_TRYWRITELOCK);
+    if (likely(locker != NULL))
+      PSI_server->start_rwlock_wrwait(locker, src_file, src_line);
+  }
+#endif
+  result= rw_trywrlock(&that->m_rwlock);
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_rwlock_wrwait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_rwlock_unlock(
+  mysql_rwlock_t *that)
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_thread *thread;
+  if (likely(PSI_server && that->m_psi))
+  {
+    thread= PSI_server->get_thread();
+    if (likely(thread != NULL))
+      PSI_server->unlock_rwlock(thread, that->m_psi);
+  }
+#endif
+  result= rw_unlock(&that->m_rwlock);
+  return result;
+}
+
+static inline int inline_mysql_cond_init(
+#ifdef HAVE_PSI_INTERFACE
+  PSI_cond_key key,
+#endif
+  mysql_cond_t *that,
+  const pthread_condattr_t *attr)
+{
+#ifdef HAVE_PSI_INTERFACE
+  that->m_psi= (PSI_server ? PSI_server->init_cond(key, &that->m_cond)
+                           : NULL);
+#else
+  that->m_psi= NULL;
+#endif
+  return pthread_cond_init(&that->m_cond, attr);
+}
+
+static inline int inline_mysql_cond_destroy(
+  mysql_cond_t *that)
+{
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(PSI_server && that->m_psi))
+  {
+    PSI_server->destroy_cond(that->m_psi);
+    that->m_psi= NULL;
+  }
+#endif
+  return pthread_cond_destroy(&that->m_cond);
+}
+
+static inline int inline_mysql_cond_wait(
+  mysql_cond_t *that,
+  mysql_mutex_t *mutex
+#ifdef HAVE_PSI_INTERFACE
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_cond_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_cond_locker(that->m_psi, mutex->m_psi,
+                                               PSI_COND_WAIT);
+    if (likely(locker != NULL))
+      PSI_server->start_cond_wait(locker, src_file, src_line);
+  }
+#endif
+  result= pthread_cond_wait(&that->m_cond, &mutex->m_mutex);
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_cond_wait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_cond_timedwait(
+  mysql_cond_t *that,
+  mysql_mutex_t *mutex,
+  struct timespec *abstime
+#ifdef HAVE_PSI_INTERFACE
+  , const char *src_file, uint src_line
+#endif
+  )
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_cond_locker *locker= NULL;
+  if (likely(PSI_server && that->m_psi))
+  {
+    locker= PSI_server->get_thread_cond_locker(that->m_psi, mutex->m_psi,
+                                               PSI_COND_TIMEDWAIT);
+    if (likely(locker != NULL))
+      PSI_server->start_cond_wait(locker, src_file, src_line);
+  }
+#endif
+  result= pthread_cond_timedwait(&that->m_cond, &mutex->m_mutex, abstime);
+#ifdef HAVE_PSI_INTERFACE
+  if (likely(locker != NULL))
+    PSI_server->end_cond_wait(locker, result);
+#endif
+  return result;
+}
+
+static inline int inline_mysql_cond_signal(
+  mysql_cond_t *that)
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_thread *thread;
+  if (likely(PSI_server && that->m_psi))
+  {
+    thread= PSI_server->get_thread();
+    if (likely(thread != NULL))
+      PSI_server->signal_cond(thread, that->m_psi);
+  }
+#endif
+  result= pthread_cond_signal(&that->m_cond);
+  return result;
+}
+
+static inline int inline_mysql_cond_broadcast(
+  mysql_cond_t *that)
+{
+  int result;
+#ifdef HAVE_PSI_INTERFACE
+  struct PSI_thread *thread;
+  if (likely(PSI_server && that->m_psi))
+  {
+    thread= PSI_server->get_thread();
+    if (likely(thread != NULL))
+      PSI_server->broadcast_cond(thread, that->m_psi);
+  }
+#endif
+  result= pthread_cond_broadcast(&that->m_cond);
+  return result;
+}
+
+#ifdef HAVE_PSI_INTERFACE
+static inline int inline_mysql_thread_create(
+  PSI_thread_key key,
+  pthread_t *thread, const pthread_attr_t *attr,
+  void *(*start_routine)(void*), void *arg)
+{
+  int result;
+  if (likely(PSI_server != NULL))
+    result= PSI_server->spawn_thread(key, thread, attr, start_routine, arg);
+  else
+    result= pthread_create(thread, attr, start_routine, arg);
+  return result;
+}
+
+static inline void inline_mysql_thread_set_psi_id(ulong id)
+{
+  if (likely(PSI_server != NULL))
+  {
+    struct PSI_thread *psi= PSI_server->get_thread();
+    if (likely(psi != NULL))
+      PSI_server->set_thread_id(psi, id);
+  }
+}
+#endif
+
+#endif /* DISABLE_MYSQL_THREAD_H */
+
+/** @} (end of group Thread_instrumentation) */
+
+#endif
+