Totally revamp thread debugging to support locating and removing deadlocks

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

apps/app_intercom.c

@@ -52,26 +52,26 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static pthread_mutex_t sound_lock = AST_MUTEX_INITIALIZER;
+static ast_mutex_t sound_lock = AST_MUTEX_INITIALIZER;
 static int sound = -1;
 
 static int write_audio(short *data, int len)
 {
 	int res;
 	struct audio_buf_info info;
-	ast_pthread_mutex_lock(&sound_lock);
+	ast_mutex_lock(&sound_lock);
 	if (sound < 0) {
 		ast_log(LOG_WARNING, "Sound device closed?\n");
-		ast_pthread_mutex_unlock(&sound_lock);
+		ast_mutex_unlock(&sound_lock);
 		return -1;
 	}
     if (ioctl(sound, SNDCTL_DSP_GETOSPACE, &info)) {
 		ast_log(LOG_WARNING, "Unable to read output space\n");
-		ast_pthread_mutex_unlock(&sound_lock);
+		ast_mutex_unlock(&sound_lock);
         return -1;
     }
 	res = write(sound, data, len);
-	ast_pthread_mutex_unlock(&sound_lock);
+	ast_mutex_unlock(&sound_lock);
 	return res;
 }
 

apps/app_macro.c

@@ -59,7 +59,7 @@ static int macro_exec(struct ast_channel *chan, void *data)
   char varname[80];
   char *oldargs[MAX_ARGS + 1] = { NULL, };
   int argc, x;
-  int res;
+  int res=0;
   char oldexten[256]="";
   int oldpriority;
   char pc[80];

apps/app_meetme.c

@@ -72,7 +72,7 @@ static struct conf {
 	struct conf *next;
 } *confs;
 
-static pthread_mutex_t conflock = AST_MUTEX_INITIALIZER;
+static ast_mutex_t conflock = AST_MUTEX_INITIALIZER;
 
 #include "enter.h"
 #include "leave.h"
@@ -112,7 +112,7 @@ static void conf_play(struct conf *conf, int sound)
 {
 	unsigned char *data;
 	int len;
-	ast_pthread_mutex_lock(&conflock);
+	ast_mutex_lock(&conflock);
 	switch(sound) {
 	case ENTER:
 		data = enter;
@@ -128,14 +128,14 @@ static void conf_play(struct conf *conf, int sound)
 	}
 	if (data) 
 		careful_write(conf->fd, data, len);
-	pthread_mutex_unlock(&conflock);
+	ast_mutex_unlock(&conflock);
 }
 
 static struct conf *build_conf(char *confno, int make)
 {
 	struct conf *cnf;
 	struct zt_confinfo ztc;
-	ast_pthread_mutex_lock(&conflock);
+	ast_mutex_lock(&conflock);
 	cnf = confs;
 	while(cnf) {
 		if (!strcmp(confno, cnf->confno)) 
@@ -179,7 +179,7 @@ static struct conf *build_conf(char *confno, int make)
 cnfout:
 	if (cnf && make) 
 		cnf->users++;
-	ast_pthread_mutex_unlock(&conflock);
+	ast_mutex_unlock(&conflock);
 	return cnf;
 }
 
@@ -431,7 +431,7 @@ zapretry:
 
 outrun:
 
-	ast_pthread_mutex_lock(&conflock);
+	ast_mutex_lock(&conflock);
 	/* Clean up */
 	conf->users--;
 	if (!conf->users) {
@@ -453,7 +453,7 @@ outrun:
 		close(conf->fd);
 		free(conf);
 	}
-	pthread_mutex_unlock(&conflock);
+	ast_mutex_unlock(&conflock);
 	return ret;
 }
 

apps/app_queue.c

@@ -145,7 +145,7 @@ struct member {
 };
 
 struct ast_call_queue {
-	pthread_mutex_t	lock;	
+	ast_mutex_t	lock;	
 	char name[80];			/* Name of the queue */
 	char moh[80];			/* Name of musiconhold to be used */
 	char announce[80];		/* Announcement to play */
@@ -170,7 +170,7 @@ struct ast_call_queue {
 };
 
 static struct ast_call_queue *queues = NULL;
-static pthread_mutex_t qlock = AST_MUTEX_INITIALIZER;
+static ast_mutex_t qlock = AST_MUTEX_INITIALIZER;
 
 static char *int2strat(int strategy)
 {
@@ -198,12 +198,12 @@ static int join_queue(char *queuename, struct queue_ent *qe)
 	struct queue_ent *cur, *prev = NULL;
 	int res = -1;
 	int pos = 0;
-	ast_pthread_mutex_lock(&qlock);
+	ast_mutex_lock(&qlock);
 	q = queues;
 	while(q) {
 		if (!strcasecmp(q->name, queuename)) {
 			/* This is our one */
-			ast_pthread_mutex_lock(&q->lock);
+			ast_mutex_lock(&q->lock);
 			if (q->members && (!q->maxlen || (q->count < q->maxlen))) {
 				/* There's space for us, put us at the end */
 				prev = NULL;
@@ -234,12 +234,12 @@ static int join_queue(char *queuename, struct queue_ent *qe)
 ast_log(LOG_NOTICE, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
 #endif
 			}
-			ast_pthread_mutex_unlock(&q->lock);
+			ast_mutex_unlock(&q->lock);
 			break;
 		}
 		q = q->next;
 	}
-	ast_pthread_mutex_unlock(&qlock);
+	ast_mutex_unlock(&qlock);
 	return res;
 }
 
@@ -258,7 +258,7 @@ static void free_members(struct ast_call_queue *q)
 static void destroy_queue(struct ast_call_queue *q)
 {
 	struct ast_call_queue *cur, *prev = NULL;
-	ast_pthread_mutex_lock(&qlock);
+	ast_mutex_lock(&qlock);
 	cur = queues;
 	while(cur) {
 		if (cur == q) {
@@ -271,7 +271,7 @@ static void destroy_queue(struct ast_call_queue *q)
 		}
 		cur = cur->next;
 	}
-	ast_pthread_mutex_unlock(&qlock);
+	ast_mutex_unlock(&qlock);
 	free_members(q);
 	free(q);
 }
@@ -284,7 +284,7 @@ static void leave_queue(struct queue_ent *qe)
 	q = qe->parent;
 	if (!q)
 		return;
-	ast_pthread_mutex_lock(&q->lock);
+	ast_mutex_lock(&q->lock);
 
 	prev = NULL;
 	cur = q->head;
@@ -310,7 +310,7 @@ ast_log(LOG_NOTICE, "Queue '%s' Leave, Channel '%s'\n", q->name, qe->chan->name
 		}
 		cur = cur->next;
 	}
-	ast_pthread_mutex_unlock(&q->lock);
+	ast_mutex_unlock(&q->lock);
 	if (q->dead && !q->count) {	
 		/* It's dead and nobody is in it, so kill it */
 		destroy_queue(q);
@@ -591,9 +591,9 @@ static int wait_our_turn(struct queue_ent *qe)
 	int res = 0;
 	for (;;) {
 		/* Atomically read the parent head */
-		pthread_mutex_lock(&qe->parent->lock);
+		ast_mutex_lock(&qe->parent->lock);
 		ch = qe->parent->head;
-		pthread_mutex_unlock(&qe->parent->lock);
+		ast_mutex_unlock(&qe->parent->lock);
 		/* If we are now at the top of the head, break out */
 		if (qe->parent->head == qe)
 			break;
@@ -610,7 +610,7 @@ static int update_queue(struct ast_call_queue *q, struct localuser *user)
 	struct member *cur;
 	/* Since a reload could have taken place, we have to traverse the list to
 		be sure it's still valid */
-	ast_pthread_mutex_lock(&q->lock);
+	ast_mutex_lock(&q->lock);
 	cur = q->members;
 	while(cur) {
 		if (user->member == cur) {
@@ -620,7 +620,7 @@ static int update_queue(struct ast_call_queue *q, struct localuser *user)
 		}
 		cur = cur->next;
 	}
-	ast_pthread_mutex_unlock(&q->lock);
+	ast_mutex_unlock(&q->lock);
 	return 0;
 }
 
@@ -692,7 +692,7 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
 	char *announce = NULL;
 	char digit = 0;
 	/* Hold the lock while we setup the outgoing calls */
-	ast_pthread_mutex_lock(&qe->parent->lock);
+	ast_mutex_lock(&qe->parent->lock);
 	cur = qe->parent->members;
 	if (strlen(qe->announce))
 		announce = qe->announce;
@@ -759,7 +759,7 @@ static int try_calling(struct queue_ent *qe, char *options, char *announceoverri
 		to = -1;
 	if (qe->parent->strategy)
 		ring_one(qe, outgoing);
-	ast_pthread_mutex_unlock(&qe->parent->lock);
+	ast_mutex_unlock(&qe->parent->lock);
 	lpeer = wait_for_answer(qe, outgoing, &to, &allowredir_in, &allowredir_out, &allowdisconnect, &digit);
 	if (lpeer)
 		peer = lpeer->chan;
@@ -846,9 +846,9 @@ static int wait_a_bit(struct queue_ent *qe)
 {
 	int retrywait;
 	/* Hold the lock while we setup the outgoing calls */
-	ast_pthread_mutex_lock(&qe->parent->lock);
+	ast_mutex_lock(&qe->parent->lock);
 	retrywait = qe->parent->retry * 1000;
-	ast_pthread_mutex_unlock(&qe->parent->lock);
+	ast_mutex_unlock(&qe->parent->lock);
 	return ast_waitfordigit(qe->chan, retrywait);
 }
 
@@ -941,7 +941,7 @@ static int rqm_exec(struct ast_channel *chan, void *data)
 	{
 		while( q && ( res != 0 ) && (!found) ) 
 		{
-			ast_pthread_mutex_lock(&q->lock);
+			ast_mutex_lock(&q->lock);
 			if( strcmp( q->name, queuename) == 0 )
 			{
 				// found queue, try to remove  interface
@@ -977,7 +977,7 @@ static int rqm_exec(struct ast_channel *chan, void *data)
 						"Not there\n", interface, queuename);
 			}
 
-			ast_pthread_mutex_unlock(&q->lock);
+			ast_mutex_unlock(&q->lock);
 			q = q->next;
 		}
 	}
@@ -1026,7 +1026,7 @@ static int aqm_exec(struct ast_channel *chan, void *data)
 	{
 		while( q && ( res != 0 ) && (!found) ) 
 		{
-			ast_pthread_mutex_lock(&q->lock);
+			ast_mutex_lock(&q->lock);
 			if( strcmp( q->name, queuename) == 0 )
 			{
 				// found queue, try to enable interface
@@ -1050,7 +1050,7 @@ static int aqm_exec(struct ast_channel *chan, void *data)
 						"Already there\n", interface, queuename);
 			}
 
-			ast_pthread_mutex_unlock(&q->lock);
+			ast_mutex_unlock(&q->lock);
 			q = q->next;
 		}
 	}
@@ -1171,7 +1171,7 @@ static void reload_queues(void)
 		ast_log(LOG_NOTICE, "No call queueing config file, so no call queues\n");
 		return;
 	}
-	ast_pthread_mutex_lock(&qlock);
+	ast_mutex_lock(&qlock);
 	/* Mark all queues as dead for the moment */
 	q = queues;
 	while(q) {
@@ -1195,7 +1195,7 @@ static void reload_queues(void)
 				if (q) {
 					/* Initialize it */
 					memset(q, 0, sizeof(struct ast_call_queue));
-					ast_pthread_mutex_init(&q->lock);
+					ast_mutex_init(&q->lock);
 					strncpy(q->name, cat, sizeof(q->name));
 					new = 1;
 				} else new = 0;
@@ -1203,7 +1203,7 @@ static void reload_queues(void)
 					new = 0;
 			if (q) {
 				if (!new) 
-					ast_pthread_mutex_lock(&q->lock);
+					ast_mutex_lock(&q->lock);
 				/* Re-initialize the queue */
 				q->dead = 0;
 				q->retry = 0;
@@ -1274,7 +1274,7 @@ static void reload_queues(void)
 				if (q->maxlen < 0)
 					q->maxlen = 0;
 				if (!new) 
-					ast_pthread_mutex_unlock(&q->lock);
+					ast_mutex_unlock(&q->lock);
 				if (new) {
 					q->next = queues;
 					queues = q;
@@ -1301,7 +1301,7 @@ static void reload_queues(void)
 			ql = q;
 		q = qn;
 	}
-	ast_pthread_mutex_unlock(&qlock);
+	ast_mutex_unlock(&qlock);
 }
 
 static int queues_show(int fd, int argc, char **argv)
@@ -1323,7 +1323,7 @@ static int queues_show(int fd, int argc, char **argv)
 		return RESULT_SUCCESS;
 	}
 	while(q) {
-		ast_pthread_mutex_lock(&q->lock);
+		ast_mutex_lock(&q->lock);
 		if (q->maxlen)
 			snprintf(max, sizeof(max), "%d", q->maxlen);
 		else
@@ -1354,7 +1354,7 @@ static int queues_show(int fd, int argc, char **argv)
 		} else
 			ast_cli(fd, "   No Callers\n");
 		ast_cli(fd, "\n");
-		ast_pthread_mutex_unlock(&q->lock);
+		ast_mutex_unlock(&q->lock);
 		q = q->next;
 	}
 	return RESULT_SUCCESS;
@@ -1379,7 +1379,7 @@ static int manager_queues_status( struct mansession *s, struct message *m )
 	time(&now);
 	q = queues;
 	while(q) {
-		ast_pthread_mutex_lock(&q->lock);
+		ast_mutex_lock(&q->lock);
 		ast_cli(s->fd, "Event: QueueParams\r\n"
 					"Queue: %s\r\n"
 					"Max: %d\r\n"
@@ -1401,7 +1401,7 @@ static int manager_queues_status( struct mansession *s, struct message *m )
 				"Wait: %ld\r\n"
 				"\r\n", 
 					q->name, pos++, qe->chan->name, (qe->chan->callerid ? qe->chan->callerid : ""), now - qe->start);
-		ast_pthread_mutex_unlock(&q->lock);
+		ast_mutex_unlock(&q->lock);
 		q = q->next;
 	}
 	return RESULT_SUCCESS;

apps/app_voicemail2.c

@@ -133,7 +133,7 @@ static char *app = "VoiceMail2";
 /* Check mail, control, etc */
 static char *app2 = "VoiceMailMain2";
 
-static pthread_mutex_t vmlock = AST_MUTEX_INITIALIZER;
+static ast_mutex_t vmlock = AST_MUTEX_INITIALIZER;
 struct ast_vm_user *users;
 struct ast_vm_user *usersl;
 struct vm_zone *zones = NULL;
@@ -183,7 +183,7 @@ static void apply_options(struct ast_vm_user *vmu, char *options)
 
 #ifdef USEMYSQLVM
 MYSQL *dbhandler=NULL;
-pthread_mutex_t mysqllock;
+ast_mutex_t mysqllock;
 char dbuser[80];
 char dbpass[80];
 char dbname[80];
@@ -241,7 +241,7 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, cha
 		} else {
 			sprintf(query, "SELECT password,fullname,email,pager,options FROM users WHERE mailbox='%s'", mailbox);
 		}
-		pthread_mutex_lock(&mysqllock);
+		ast_mutex_lock(&mysqllock);
 		mysql_query(dbhandler, query);
 		if ((result=mysql_store_result(dbhandler))!=NULL) {
 			if ((rowval=mysql_fetch_row(result))!=NULL) {
@@ -264,16 +264,16 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, cha
 					}
 				}
 				mysql_free_result(result);
-				pthread_mutex_unlock(&mysqllock);
+				ast_mutex_unlock(&mysqllock);
 				return(retval);
 			} else {
 				mysql_free_result(result);
-				pthread_mutex_unlock(&mysqllock);
+				ast_mutex_unlock(&mysqllock);
 				free(retval);
 				return(NULL);
 			}
 		}
-		pthread_mutex_unlock(&mysqllock);
+		ast_mutex_unlock(&mysqllock);
 		free(retval);
 	}
 	return(NULL);
@@ -288,10 +288,10 @@ static void vm_change_password(struct ast_vm_user *vmu, char *password)
 	} else {
 		sprintf(query, "UPDATE users SET password='%s' WHERE mailbox='%s' AND password='%s'", password, vmu->mailbox, vmu->password);
 	}
-	pthread_mutex_lock(&mysqllock);
+	ast_mutex_lock(&mysqllock);
 	mysql_query(dbhandler, query);
 	strcpy(vmu->password, password);
-	pthread_mutex_unlock(&mysqllock);
+	ast_mutex_unlock(&mysqllock);
 }
 
 static void reset_user_pw(char *context, char *mailbox, char *password)
@@ -303,9 +303,9 @@ static void reset_user_pw(char *context, char *mailbox, char *password)
 	} else {
 		sprintf(query, "UPDATE users SET password='%s' WHERE mailbox='%s'", password, mailbox);
 	}
-	pthread_mutex_lock(&mysqllock);
+	ast_mutex_lock(&mysqllock);
 	mysql_query(dbhandler, query);
-	pthread_mutex_unlock(&mysqllock);
+	ast_mutex_unlock(&mysqllock);
 }
 #else
 
@@ -313,7 +313,7 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, cha
 {
 	/* This function could be made to generate one from a database, too */
 	struct ast_vm_user *vmu=NULL, *cur;
-	ast_pthread_mutex_lock(&vmlock);
+	ast_mutex_lock(&vmlock);
 	cur = users;
 	while(cur) {
 		if ((!context || !strcasecmp(context, cur->context)) &&
@@ -336,7 +336,7 @@ static struct ast_vm_user *find_user(struct ast_vm_user *ivm, char *context, cha
 			vmu->next = NULL;
 		}
 	}
-	ast_pthread_mutex_unlock(&vmlock);
+	ast_mutex_unlock(&vmlock);
 	return vmu;
 }
 
@@ -345,7 +345,7 @@ static int reset_user_pw(char *context, char *mailbox, char *newpass)
 	/* This function could be made to generate one from a database, too */
 	struct ast_vm_user *cur;
 	int res = -1;
-	ast_pthread_mutex_lock(&vmlock);
+	ast_mutex_lock(&vmlock);
 	cur = users;
 	while(cur) {
 		if ((!context || !strcasecmp(context, cur->context)) &&
@@ -357,7 +357,7 @@ static int reset_user_pw(char *context, char *mailbox, char *newpass)
 		strncpy(cur->password, newpass, sizeof(cur->password) - 1);
 		res = 0;
 	}
-	ast_pthread_mutex_unlock(&vmlock);
+	ast_mutex_unlock(&vmlock);
 	return res;
 }
 
@@ -2876,7 +2876,7 @@ static int load_config(void)
 	int x;
 
 	cfg = ast_load(VOICEMAIL_CONFIG);
-	ast_pthread_mutex_lock(&vmlock);
+	ast_mutex_lock(&vmlock);
 	cur = users;
 	while(cur) {
 		l = cur;
@@ -3054,10 +3054,10 @@ static int load_config(void)
 			}
 		}
 		ast_destroy(cfg);
-		ast_pthread_mutex_unlock(&vmlock);
+		ast_mutex_unlock(&vmlock);
 		return 0;
 	} else {
-		ast_pthread_mutex_unlock(&vmlock);
+		ast_mutex_unlock(&vmlock);
 		ast_log(LOG_WARNING, "Error reading voicemail config\n");
 		return -1;
 	}