kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Totally revamp thread debugging to support locating and removing deadlocks

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-08-13 15:25:16 +00:00
parent 4a396046fe
commit 1bb58646de
76 changed files with 1789 additions and 1723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app_meetme.c
View File

@@ -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;
}