kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 19:28:53 +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

18
formats/format_vox.c
View File

@@ -48,7 +48,7 @@ struct ast_filestream {
};
static pthread_mutex_t vox_lock = AST_MUTEX_INITIALIZER;
static ast_mutex_t vox_lock = AST_MUTEX_INITIALIZER;
static int glistcnt = 0;
static char *name = "vox";
@@ -171,7 +171,7 @@ static struct ast_filestream *vox_open(int fd)
struct ast_filestream *tmp;
if ((tmp = malloc(sizeof(struct ast_filestream)))) {
memset(tmp, 0, sizeof(struct ast_filestream));
if (ast_pthread_mutex_lock(&vox_lock)) {
if (ast_mutex_lock(&vox_lock)) {
ast_log(LOG_WARNING, "Unable to lock vox list\n");
free(tmp);
return NULL;
@@ -185,7 +185,7 @@ static struct ast_filestream *vox_open(int fd)
tmp->fr.mallocd = 0;
tmp->lasttimeout = -1;
glistcnt++;
ast_pthread_mutex_unlock(&vox_lock);
ast_mutex_unlock(&vox_lock);
ast_update_use_count();
}
return tmp;
@@ -199,14 +199,14 @@ static struct ast_filestream *vox_rewrite(int fd, char *comment)
struct ast_filestream *tmp;
if ((tmp = malloc(sizeof(struct ast_filestream)))) {
memset(tmp, 0, sizeof(struct ast_filestream));
if (ast_pthread_mutex_lock(&vox_lock)) {
if (ast_mutex_lock(&vox_lock)) {
ast_log(LOG_WARNING, "Unable to lock vox list\n");
free(tmp);
return NULL;
}
tmp->fd = fd;
glistcnt++;
ast_pthread_mutex_unlock(&vox_lock);
ast_mutex_unlock(&vox_lock);
ast_update_use_count();
} else
ast_log(LOG_WARNING, "Out of memory\n");
@@ -215,12 +215,12 @@ static struct ast_filestream *vox_rewrite(int fd, char *comment)
static void vox_close(struct ast_filestream *s)
{
if (ast_pthread_mutex_lock(&vox_lock)) {
if (ast_mutex_lock(&vox_lock)) {
ast_log(LOG_WARNING, "Unable to lock vox list\n");
return;
}
glistcnt--;
ast_pthread_mutex_unlock(&vox_lock);
ast_mutex_unlock(&vox_lock);
ast_update_use_count();
close(s->fd);
free(s);
@@ -324,12 +324,12 @@ int unload_module()
int usecount()
{
int res;
if (ast_pthread_mutex_lock(&vox_lock)) {
if (ast_mutex_lock(&vox_lock)) {
ast_log(LOG_WARNING, "Unable to lock vox list\n");
return -1;
}
res = glistcnt;
ast_pthread_mutex_unlock(&vox_lock);
ast_mutex_unlock(&vox_lock);
return res;
}