diff options
author | Mark Michelson <mmichelson@digium.com> | 2016-01-20 14:18:57 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-01-20 14:18:57 -0600 |
commit | 8adb8e3e1addb12f4228dba5025569b1770c57ec (patch) | |
tree | ee334d17fd916e2e31e68bb0953c51bcffbe750b /main | |
parent | c63458118a76d59f036d57a3449240042163a709 (diff) | |
parent | 6e2a867716e89bd3472fd750f04fe6953bef3d16 (diff) |
Merge "taskprocessor.c: Fix some taskprocessor unrefs."
Diffstat (limited to 'main')
-rw-r--r-- | main/taskprocessor.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/main/taskprocessor.c b/main/taskprocessor.c index 5f2f8de44..49022d34e 100644 --- a/main/taskprocessor.c +++ b/main/taskprocessor.c @@ -332,10 +332,11 @@ static void *tps_task_free(struct tps_task *task) } /* taskprocessor tab completion */ -static char *tps_taskprocessor_tab_complete(struct ast_taskprocessor *p, struct ast_cli_args *a) +static char *tps_taskprocessor_tab_complete(struct ast_cli_args *a) { int tklen; int wordnum = 0; + struct ast_taskprocessor *p; char *name = NULL; struct ao2_iterator i; @@ -347,10 +348,10 @@ static char *tps_taskprocessor_tab_complete(struct ast_taskprocessor *p, struct while ((p = ao2_iterator_next(&i))) { if (!strncasecmp(a->word, p->name, tklen) && ++wordnum > a->n) { name = ast_strdup(p->name); - ao2_ref(p, -1); + ast_taskprocessor_unreference(p); break; } - ao2_ref(p, -1); + ast_taskprocessor_unreference(p); } ao2_iterator_destroy(&i); return name; @@ -372,7 +373,7 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args const char *name; struct timeval when; struct timespec ts; - struct ast_taskprocessor *tps = NULL; + struct ast_taskprocessor *tps; switch (cmd) { case CLI_INIT: @@ -382,7 +383,7 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args " Displays the time required for a task to be processed\n"; return NULL; case CLI_GENERATE: - return tps_taskprocessor_tab_complete(tps, a); + return tps_taskprocessor_tab_complete(a); } if (a->argc != 4) @@ -401,7 +402,7 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args if (ast_taskprocessor_push(tps, tps_ping_handler, 0) < 0) { ast_mutex_unlock(&cli_ping_cond_lock); ast_cli(a->fd, "\nping failed: could not push task to %s\n\n", name); - ao2_ref(tps, -1); + ast_taskprocessor_unreference(tps); return CLI_FAILURE; } ast_cond_timedwait(&cli_ping_cond, &cli_ping_cond_lock, &ts); @@ -409,7 +410,7 @@ static char *cli_tps_ping(struct ast_cli_entry *e, int cmd, struct ast_cli_args end = ast_tvnow(); delta = ast_tvsub(end, begin); ast_cli(a->fd, "\n\t%24s ping time: %.1ld.%.6ld sec\n\n", name, (long)delta.tv_sec, (long int)delta.tv_usec); - ao2_ref(tps, -1); + ast_taskprocessor_unreference(tps); return CLI_SUCCESS; } @@ -663,6 +664,8 @@ static struct ast_taskprocessor *__allocate_taskprocessor(const char *name, stru if (!(ao2_link(tps_singletons, p))) { ast_log(LOG_ERROR, "Failed to add taskprocessor '%s' to container\n", p->name); + listener->tps = NULL; + ao2_ref(p, -1); return NULL; } |