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 /formats/format_h263.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 'formats/format_h263.c')
| -rwxr-xr-x | formats/format_h263.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/formats/format_h263.c b/formats/format_h263.c index 19a57ed5a..6e0f8edad 100755 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -49,7 +49,7 @@ struct ast_filestream { }; -static pthread_mutex_t h263_lock = AST_MUTEX_INITIALIZER; +static ast_mutex_t h263_lock = AST_MUTEX_INITIALIZER; static int glistcnt = 0; static char *name = "h263"; @@ -71,7 +71,7 @@ static struct ast_filestream *h263_open(int fd) if ((tmp = malloc(sizeof(struct ast_filestream)))) { memset(tmp, 0, sizeof(struct ast_filestream)); - if (ast_pthread_mutex_lock(&h263_lock)) { + if (ast_mutex_lock(&h263_lock)) { ast_log(LOG_WARNING, "Unable to lock h263 list\n"); free(tmp); return NULL; @@ -84,7 +84,7 @@ static struct ast_filestream *h263_open(int fd) tmp->fr.src = name; tmp->fr.mallocd = 0; glistcnt++; - ast_pthread_mutex_unlock(&h263_lock); + ast_mutex_unlock(&h263_lock); ast_update_use_count(); } return tmp; @@ -98,14 +98,14 @@ static struct ast_filestream *h263_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(&h263_lock)) { + if (ast_mutex_lock(&h263_lock)) { ast_log(LOG_WARNING, "Unable to lock h263 list\n"); free(tmp); return NULL; } tmp->fd = fd; glistcnt++; - ast_pthread_mutex_unlock(&h263_lock); + ast_mutex_unlock(&h263_lock); ast_update_use_count(); } else ast_log(LOG_WARNING, "Out of memory\n"); @@ -114,12 +114,12 @@ static struct ast_filestream *h263_rewrite(int fd, char *comment) static void h263_close(struct ast_filestream *s) { - if (ast_pthread_mutex_lock(&h263_lock)) { + if (ast_mutex_lock(&h263_lock)) { ast_log(LOG_WARNING, "Unable to lock h263 list\n"); return; } glistcnt--; - ast_pthread_mutex_unlock(&h263_lock); + ast_mutex_unlock(&h263_lock); ast_update_use_count(); close(s->fd); free(s); @@ -250,12 +250,12 @@ int unload_module() int usecount() { int res; - if (ast_pthread_mutex_lock(&h263_lock)) { + if (ast_mutex_lock(&h263_lock)) { ast_log(LOG_WARNING, "Unable to lock h263 list\n"); return -1; } res = glistcnt; - ast_pthread_mutex_unlock(&h263_lock); + ast_mutex_unlock(&h263_lock); return res; } |