From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 25 Oct 2013 23:52:13 +0000 (+0000)
Subject: taskprocessor: Made use pthread_equal() to compare thread ids.
X-Git-Tag: 12.0.0-beta2~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ae14324aaf811ad7fe3cbc7dcee574a2c1d26e5;p=thirdparty%2Fasterisk.git

taskprocessor: Made use pthread_equal() to compare thread ids.

* Removed another silly use of RAII_VAR().  RAII_VAR() and SCOPED_LOCK()
are not silver bullets that allow you to turn off your brain.


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

diff --git a/main/taskprocessor.c b/main/taskprocessor.c
index 189219d668..ac8df97729 100644
--- a/main/taskprocessor.c
+++ b/main/taskprocessor.c
@@ -232,17 +232,17 @@ static void default_listener_shutdown(struct ast_taskprocessor_listener *listene
 
 	ast_taskprocessor_push(listener->tps, default_listener_die, pvt);
 
-	if (pthread_self() == pvt->poll_thread) {
+	ast_assert(pvt->poll_thread != AST_PTHREADT_NULL);
+
+	if (pthread_equal(pthread_self(), pvt->poll_thread)) {
 		res = pthread_detach(pvt->poll_thread);
 		if (res != 0) {
-			ast_log(LOG_ERROR, "pthread_detach(): %s\n",
-				strerror(errno));
+			ast_log(LOG_ERROR, "pthread_detach(): %s\n", strerror(errno));
 		}
 	} else {
 		res = pthread_join(pvt->poll_thread, NULL);
 		if (res != 0) {
-			ast_log(LOG_ERROR, "pthread_join(): %s\n",
-				strerror(errno));
+			ast_log(LOG_ERROR, "pthread_join(): %s\n", strerror(errno));
 		}
 	}
 	pvt->poll_thread = AST_PTHREADT_NULL;
@@ -538,18 +538,15 @@ static void taskprocessor_listener_dtor(void *obj)
 
 struct ast_taskprocessor_listener *ast_taskprocessor_listener_alloc(const struct ast_taskprocessor_listener_callbacks *callbacks, void *user_data)
 {
-	RAII_VAR(struct ast_taskprocessor_listener *, listener,
-			NULL, ao2_cleanup);
+	struct ast_taskprocessor_listener *listener;
 
 	listener = ao2_alloc(sizeof(*listener), taskprocessor_listener_dtor);
-
 	if (!listener) {
 		return NULL;
 	}
 	listener->callbacks = callbacks;
 	listener->user_data = user_data;
 
-	ao2_ref(listener, +1);
 	return listener;
 }