Remove a lock that doesn't make any sense. The regions lock needs to be held

when traversing the list of allocated chunks so that they can be printed out
to the CLI.
(Thanks to eliel on #asterisk-dev for pointing this out!)


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@87373 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 3 deletions

diff --git a/main/astmm.c b/main/astmm.c
index 260f5d1dd..eeeaf5bd8 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -82,7 +82,6 @@ static struct ast_region {
 	(((unsigned long)(a)) % SOME_PRIME)
 	
 AST_MUTEX_DEFINE_STATIC_NOTRACKING(reglock);
-AST_MUTEX_DEFINE_STATIC(showmemorylock);
 
 #define astmm_log(...)                               \
 	do {                                         \
@@ -318,7 +317,7 @@ static int handle_show_memory(int fd, int argc, char *argv[])
 	if (argc > 3)
 		fn = argv[3];
 
-	ast_mutex_lock(&showmemorylock);
+	ast_mutex_lock(&reglock);
 	for (x = 0; x < SOME_PRIME; x++) {
 		for (reg = regions[x]; reg; reg = reg->next) {
 			if (!fn || !strcasecmp(fn, reg->file) || !strcasecmp(fn, "anomolies")) {
@@ -344,7 +343,7 @@ static int handle_show_memory(int fd, int argc, char *argv[])
 			}
 		}
 	}
-	ast_mutex_unlock(&showmemorylock);
+	ast_mutex_unlock(&reglock);
 	
 	if (cache_len)
 		ast_cli(fd, "%d bytes allocated (%d in caches) in %d allocations\n", len, cache_len, count);