kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify macro usage

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19614 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-04-12 23:33:47 +00:00
parent a015d0b36f
commit 371e0316f0
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/asterisk/lock.h
View File

@@ -60,17 +60,19 @@
* non-blocking calls. * non-blocking calls.
*/ */
#ifndef HAVE_MTX_PROFILE #ifndef HAVE_MTX_PROFILE
#define __MTX_PROF /* nothing */ #define __MTX_PROF(a) return pthread_mutex_lock((a))
#else #else
#define __MTX_PROF { \ #define __MTX_PROF(a) do { \
int i; \ int i; \
/* profile only non-blocking events */ \ /* profile only non-blocking events */ \
ast_mark(mtx_prof, 1); \ ast_mark(mtx_prof, 1); \
i = pthread_mutex_trylock(pmutex); \ i = pthread_mutex_trylock((a)); \
ast_mark(mtx_prof, 0); \ ast_mark(mtx_prof, 0); \
if (!i) \ if (!i) \
return i; \ return i; \
} else \
return pthread_mutex_lock((a)); \
} while (0)
#endif /* HAVE_MTX_PROFILE */ #endif /* HAVE_MTX_PROFILE */
#include <pthread.h> #include <pthread.h>
@@ -610,8 +612,7 @@ static void __attribute__ ((destructor)) fini_##mutex(void) \
static inline int ast_mutex_lock(ast_mutex_t *pmutex) static inline int ast_mutex_lock(ast_mutex_t *pmutex)
{ {
__MTX_PROF __MTX_PROF(pmutex);
return pthread_mutex_lock(pmutex);
} }
static inline int ast_mutex_trylock(ast_mutex_t *pmutex) static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
@@ -631,8 +632,7 @@ static inline int ast_mutex_lock(ast_mutex_t *pmutex)
{ {
if (*pmutex == (ast_mutex_t)AST_MUTEX_KIND) if (*pmutex == (ast_mutex_t)AST_MUTEX_KIND)
ast_mutex_init(pmutex); ast_mutex_init(pmutex);
__MTX_PROF __MTX_PROF(pmutex);
return pthread_mutex_lock(pmutex);
} }
static inline int ast_mutex_trylock(ast_mutex_t *pmutex) static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
@@ -648,8 +648,7 @@ static inline int ast_mutex_trylock(ast_mutex_t *pmutex)
static inline int ast_mutex_lock(ast_mutex_t *pmutex) static inline int ast_mutex_lock(ast_mutex_t *pmutex)
{ {
__MTX_PROF __MTX_PROF(pmutex);
return pthread_mutex_lock(pmutex);
} }
static inline int ast_mutex_trylock(ast_mutex_t *pmutex) static inline int ast_mutex_trylock(ast_mutex_t *pmutex)