diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 03:56:37 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-10 03:56:37 +0000 |
| commit | 8171f30e10fdbded326179d2dc3e3db0e979077f (patch) | |
| tree | 110e32ced45d265536e6557ff2752f2366fefb26 /include/asterisk/lock.h | |
| parent | 58d560b99447624b2d7ccce9a6197e64fedd7776 (diff) | |
Merged revisions 187599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r187599 | tilghman | 2009-04-09 22:55:27 -0500 (Thu, 09 Apr 2009) | 2 lines
Modify headers and macros, according to Russell's suggestions on the -dev list
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@187600 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/lock.h')
| -rw-r--r-- | include/asterisk/lock.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 139f54cad..bba20c85d 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -1335,6 +1335,7 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *t, const char *name, if (lt->reentrancy) { ast_reentrancy_lock(lt); bt = <->backtrace[lt->reentrancy-1]; + ast_reentrancy_unlock(lt); } else { bt = NULL; } @@ -1353,7 +1354,7 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *t, const char *name, return res; } -#define ast_rwlock_timedrdlock(a,b) \ +#define ast_rwlock_timedrdlock(a, b) \ _ast_rwlock_timedrdlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__) static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name, @@ -1413,6 +1414,7 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name, if (lt->reentrancy) { ast_reentrancy_lock(lt); bt = <->backtrace[lt->reentrancy-1]; + ast_reentrancy_unlock(lt); } else { bt = NULL; } @@ -1431,7 +1433,7 @@ static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name, return res; } -#define ast_rwlock_timedwrlock(a,b) \ +#define ast_rwlock_timedwrlock(a, b) \ _ast_rwlock_timedwrlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__) static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name, @@ -1491,6 +1493,7 @@ static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name, if (lt->reentrancy) { ast_reentrancy_lock(lt); bt = <->backtrace[lt->reentrancy-1]; + ast_reentrancy_unlock(lt); } else { bt = NULL; } |