[Asterisk-code-review] taskprocessor.c: Fix some taskprocessor unrefs. (asterisk[13])

[Mark Michelson]

Mark Michelson has submitted this change and it was merged.

Change subject: taskprocessor.c: Fix some taskprocessor unrefs.
......................................................................


taskprocessor.c: Fix some taskprocessor unrefs.

You have to call ast_taskprocessor_unref() outside of the taskprocessor
implementation code.  Taskprocessor use since v12 has become more
transient than just the singleton uses in earlier versions.

Change-Id: If7675299924c0cc65f2a43a85254e6f06f2d61bb
---
M main/taskprocessor.c
1 file changed, 10 insertions(+), 7 deletions(-)

Approvals:
  Mark Michelson: Looks good to me, approved
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 05d6461..8e4381d 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -332,10 +332,11 @@
 }
 
 /* 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 @@
 	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 @@
 	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 @@
 			"	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 @@
 	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 @@
 	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 @@
 
 	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;
 	}
 

-- 
To view, visit https://gerrit.asterisk.org/2047
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If7675299924c0cc65f2a43a85254e6f06f2d61bb
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Mark Michelson <mmichelson at digium.com>