Merged revisions 84206 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 1 Oct 2007 19:40:21 +0000 (19:40 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 1 Oct 2007 19:40:21 +0000 (19:40 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84206 | russell | 2007-10-01 14:34:12 -0500 (Mon, 01 Oct 2007) | 2 lines

Show rwlocks in the "core show locks" output.  Before, it only showed mutexes.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84207 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/lock.h

index 686f366..cbd8f3a 100644 (file)
@@ -702,6 +702,84 @@ static inline int ast_rwlock_destroy(ast_rwlock_t *prwlock)
        return pthread_rwlock_destroy(prwlock);
 }
 
+#ifdef DEBUG_THREADS
+#define ast_rwlock_unlock(a) \
+       _ast_rwlock_unlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+static inline int _ast_rwlock_unlock(ast_rwlock_t *lock, const char *name,
+       const char *file, int line, const char *func)
+{
+       int res;
+       res = pthread_rwlock_unlock(lock);
+       ast_remove_lock_info(lock);
+       return res;
+}
+
+#define ast_rwlock_rdlock(a) \
+       _ast_rwlock_rdlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+static inline int _ast_rwlock_rdlock(ast_rwlock_t *lock, const char *name,
+       const char *file, int line, const char *func)
+{
+       int res;
+       ast_store_lock_info(file, line, func, name, lock);
+       res = pthread_rwlock_rdlock(lock);
+       if (!res)
+               ast_mark_lock_acquired();
+       else
+               ast_remove_lock_info(lock);
+       return res;
+}
+
+#define ast_rwlock_wrlock(a) \
+       _ast_rwlock_wrlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+static inline int _ast_rwlock_wrlock(ast_rwlock_t *lock, const char *name,
+       const char *file, int line, const char *func)
+{
+       int res;
+       ast_store_lock_info(file, line, func, name, lock);
+       res = pthread_rwlock_wrlock(lock);
+       if (!res)
+               ast_mark_lock_acquired();
+       else
+               ast_remove_lock_info(lock);
+       return res;
+}
+
+#define ast_rwlock_tryrdlock(a) \
+       _ast_rwlock_tryrdlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+static inline int _ast_rwlock_tryrdlock(ast_rwlock_t *lock, const char *name,
+       const char *file, int line, const char *func)
+{
+       int res;
+       ast_store_lock_info(file, line, func, name, lock);
+       res = pthread_rwlock_tryrdlock(lock);
+       if (!res)
+               ast_mark_lock_acquired();
+       else
+               ast_remove_lock_info(lock);
+       return res;
+}
+
+#define ast_rwlock_trywrlock(a) \
+       _ast_rwlock_trywrlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+
+static inline int _ast_rwlock_trywrlock(ast_rwlock_t *lock, const char *name,
+       const char *file, int line, const char *func)
+{
+       int res;
+       ast_store_lock_info(file, line, func, name, lock);
+       res = pthread_rwlock_trywrlock(lock);
+       if (!res)
+               ast_mark_lock_acquired();
+       else
+               ast_remove_lock_info(lock);
+       return res;
+}
+
+#else
 static inline int ast_rwlock_unlock(ast_rwlock_t *prwlock)
 {
        return pthread_rwlock_unlock(prwlock);
@@ -726,6 +804,7 @@ static inline int ast_rwlock_trywrlock(ast_rwlock_t *prwlock)
 {
        return pthread_rwlock_trywrlock(prwlock);
 }
+#endif /* DEBUG_THREADS */
 
 /* Statically declared read/write locks */