diff options
author | Jeremy McNamara <jj@nufone.net> | 2004-01-11 22:36:37 +0000 |
---|---|---|
committer | Jeremy McNamara <jj@nufone.net> | 2004-01-11 22:36:37 +0000 |
commit | 673814eac56faf7706e02fbeae75a7e16c4460a5 (patch) | |
tree | 6fbb1cbafe1f7ddfd5fe89f5d23323b37c6f2825 | |
parent | f102ce6f263f2c147792bb14ec8cad64f593290b (diff) |
fix deadlock issues with astmm
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | astmm.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -57,6 +57,7 @@ static struct ast_region { (((unsigned long)(a)) % SOME_PRIME) static ast_mutex_t reglock = AST_MUTEX_INITIALIZER; +static ast_mutex_t showmemorylock = AST_MUTEX_INITIALIZER; static inline void *__ast_alloc_region(size_t size, int which, const char *file, int lineno, const char *func) { @@ -227,7 +228,7 @@ static int handle_show_memory(int fd, int argc, char *argv[]) fn = argv[3]; /* try to lock applications list ... */ - ast_mutex_lock(®lock); + ast_mutex_lock(&showmemorylock); for (x=0;x<SOME_PRIME;x++) { reg = regions[x]; @@ -241,7 +242,7 @@ static int handle_show_memory(int fd, int argc, char *argv[]) } } ast_cli(fd, "%d bytes allocated %d units total\n", len, count); - ast_mutex_unlock(®lock); + ast_mutex_unlock(&showmemorylock); return RESULT_SUCCESS; } |