diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 01:36:42 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-27 01:36:42 +0000 |
commit | 04e3d952a1ce7b8c434ae72e7e44cecc9290a429 (patch) | |
tree | cb04715c2805112af284389de641669601ade34a /main | |
parent | d799f53155f3958f6b5fabe9b4d60d1f87a07240 (diff) |
Merged revisions 184512 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r184512 | russell | 2009-03-26 20:35:56 -0500 (Thu, 26 Mar 2009) | 2 lines
Pass more useful information through to lock tracking when DEBUG_THREADS is on.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@184513 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/heap.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/main/heap.c b/main/heap.c index 5e8a2baef..ee99f9919 100644 --- a/main/heap.c +++ b/main/heap.c @@ -267,6 +267,8 @@ size_t ast_heap_size(struct ast_heap *h) return h->cur_len; } +#ifndef DEBUG_THREADS + int ast_heap_wrlock(struct ast_heap *h) { return ast_rwlock_wrlock(&h->lock); @@ -282,3 +284,21 @@ int ast_heap_unlock(struct ast_heap *h) return ast_rwlock_unlock(&h->lock); } +#else /* DEBUG_THREADS */ + +int __ast_heap_wrlock(struct ast_heap *h, const char *file, const char *func, int line) +{ + return _ast_rwlock_wrlock(&h->lock, "&h->lock", file, line, func); +} + +int __ast_heap_rdlock(struct ast_heap *h, const char *file, const char *func, int line) +{ + return _ast_rwlock_rdlock(&h->lock, "&h->lock", file, line, func); +} + +int __ast_heap_unlock(struct ast_heap *h, const char *file, const char *func, int line) +{ + return _ast_rwlock_unlock(&h->lock, "&h->lock", file, line, func); +} + +#endif /* DEBUG_THREADS */ |