diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-13 15:25:16 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-08-13 15:25:16 +0000 |
commit | dbc9edcaac6ec1d2059f4c5bcd27cca6c266f5bf (patch) | |
tree | 3f2cc11c392b1496cf6518e8b6eb99e8b04417a1 /channels/chan_alsa.c | |
parent | 231b9aad4020331a8c68d1a2826ee1ef930ec57b (diff) |
Totally revamp thread debugging to support locating and removing deadlocks
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1310 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_alsa.c')
-rwxr-xr-x | channels/chan_alsa.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index dfbce5722..e7ec368b4 100755 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -71,7 +71,7 @@ static int silencethreshold = 1000; static char digits[80] = ""; static char text2send[80] = ""; -static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER; +static ast_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER; static char *type = "Console"; static char *desc = "ALSA Console Channel Driver"; @@ -518,9 +518,9 @@ static int alsa_hangup(struct ast_channel *c) c->pvt->pvt = NULL; alsa.owner = NULL; ast_verbose( " << Hangup on console >> \n"); - ast_pthread_mutex_lock(&usecnt_lock); + ast_mutex_lock(&usecnt_lock); usecnt--; - ast_pthread_mutex_unlock(&usecnt_lock); + ast_mutex_unlock(&usecnt_lock); needhangup = 0; needanswer = 0; if (hookstate) { @@ -807,9 +807,9 @@ static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state) strncpy(tmp->language, language, sizeof(tmp->language)-1); p->owner = tmp; ast_setstate(tmp, state); - ast_pthread_mutex_lock(&usecnt_lock); + ast_mutex_lock(&usecnt_lock); usecnt++; - ast_pthread_mutex_unlock(&usecnt_lock); + ast_mutex_unlock(&usecnt_lock); ast_update_use_count(); if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { @@ -1103,9 +1103,9 @@ char *description() int usecount() { int res; - ast_pthread_mutex_lock(&usecnt_lock); + ast_mutex_lock(&usecnt_lock); res = usecnt; - ast_pthread_mutex_unlock(&usecnt_lock); + ast_mutex_unlock(&usecnt_lock); return res; } |