From 70db49ae2f8229ed4e6495051b9f83788c1f6f3b Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 29 Oct 2007 19:47:52 +0000 Subject: [PATCH] Merged revisions 87373 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87373 | russell | 2007-10-29 14:21:06 -0500 (Mon, 29 Oct 2007) | 5 lines 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: https://origsvn.digium.com/svn/asterisk/trunk@87392 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/astmm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main/astmm.c b/main/astmm.c index 4bd4a6b75f..1eee41df92 100644 --- a/main/astmm.c +++ b/main/astmm.c @@ -84,7 +84,6 @@ static struct ast_region { /*! Tracking this mutex will cause infinite recursion, as the mutex tracking * code allocates memory */ AST_MUTEX_DEFINE_STATIC_NOTRACKING(reglock); -AST_MUTEX_DEFINE_STATIC(showmemorylock); #define astmm_log(...) \ do { \ @@ -333,7 +332,7 @@ static char *handle_memory_show(struct ast_cli_entry *e, int cmd, struct ast_cli if (a->argc > 3) fn = a->argv[3]; - ast_mutex_lock(&showmemorylock); + ast_mutex_lock(®lock); for (x = 0; x < SOME_PRIME; x++) { for (reg = regions[x]; reg; reg = reg->next) { if (!fn || !strcasecmp(fn, reg->file) || !strcasecmp(fn, "anomolies")) { @@ -359,7 +358,7 @@ static char *handle_memory_show(struct ast_cli_entry *e, int cmd, struct ast_cli } } } - ast_mutex_unlock(&showmemorylock); + ast_mutex_unlock(®lock); if (cache_len) ast_cli(a->fd, "%d bytes allocated (%d in caches) in %d allocations\n", len, cache_len, count);