automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38568 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/frame.c b/frame.c
index 2b504399d0ee772762ae67aac526d2465e8c0a76..ed282f0c751558fc0346dca4aeb340602568e633 100644 (file)
--- a/frame.c
+++ b/frame.c
@@ -253,9 +253,9 @@ static struct ast_frame *ast_frame_header_new(void)
                memset(f, 0, sizeof(struct ast_frame));
 #ifdef TRACE_FRAMES
        if (f) {
-               headers++;
                f->prev = NULL;
                ast_mutex_lock(&framelock);
+               headers++;
                f->next = headerlist;
                if (headerlist)
                        headerlist->prev = f;
@@ -282,8 +282,8 @@ void ast_frfree(struct ast_frame *fr)
        }
        if (fr->mallocd & AST_MALLOCD_HDR) {
 #ifdef TRACE_FRAMES
-               headers--;
                ast_mutex_lock(&framelock);
+               headers--;
                if (fr->next)
                        fr->next->prev = fr->prev;
                if (fr->prev)
@@ -835,11 +835,11 @@ static int show_frame_stats(int fd, int argc, char *argv[])
        int x=1;
        if (argc != 3)
                return RESULT_SHOWUSAGE;
+       ast_mutex_lock(&framelock);
        ast_cli(fd, "     Framer Statistics     \n");
        ast_cli(fd, "---------------------------\n");
        ast_cli(fd, "Total allocated headers: %d\n", headers);
        ast_cli(fd, "Queue Dump:\n");
-       ast_mutex_lock(&framelock);
        for (f=headerlist; f; f = f->next) {
                ast_cli(fd, "%d.  Type %d, subclass %d from %s\n", x++, f->frametype, f->subclass, f->src ? f->src : "<Unknown>");
        }