diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-08-11 01:12:01 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-08-11 01:12:01 +0400 |
| commit | 265a6edd23cfdb69c6ac072bf01887f7aed1168c (patch) | |
| tree | 963c21bfca01bc89ae96c0574759e4e82383c83f /include/mysql | |
| parent | 64cc044e33632b6805e13bc04cbaf7e079c66d32 (diff) | |
| download | mariadb-git-265a6edd23cfdb69c6ac072bf01887f7aed1168c.tar.gz | |
A pre-requisite patch for the fix for Bug#52044.
Implement a few simple asserts in my_rwlock_t locks.
include/my_pthread.h:
Declare two simple assert functions.
include/mysql/psi/mysql_thread.h:
Add wrappers for new assert functions.
mysys/thr_rwlock.c:
Add asserts.
sql/sql_base.cc:
Silence a compiler warning for the case when
SAFE_MUTEX is not ON.
Diffstat (limited to 'include/mysql')
| -rw-r--r-- | include/mysql/psi/mysql_thread.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h index d133f2655fb..60b4f5d6ef4 100644 --- a/include/mysql/psi/mysql_thread.h +++ b/include/mysql/psi/mysql_thread.h @@ -215,6 +215,14 @@ typedef struct st_mysql_cond mysql_cond_t; #define mysql_mutex_assert_not_owner(M) \ safe_mutex_assert_not_owner(&(M)->m_mutex) +/** Wrappers for instrumented prlock objects. */ + +#define mysql_prlock_assert_write_owner(M) \ + rw_pr_lock_assert_write_owner(&(M)->m_prlock) + +#define mysql_prlock_assert_not_write_owner(M) \ + rw_pr_lock_assert_not_write_owner(&(M)->m_prlock) + /** @def mysql_mutex_init(K, M, A) Instrumented mutex_init. |