diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-07 21:24:33 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-07 21:24:33 +0000 |
| commit | 57bb3e34aa073102a984605804bbf4525ccdea82 (patch) | |
| tree | 4c7f5478f7034d7d0408faa75c6619abf63caed0 | |
| parent | c1b7184750e8f117e1c5e65faacb15be03510a52 (diff) | |
Make the lock protecting each thread's list of locks it currently holds
recursive. I think that this will fix the situation where some people have
said that "core show locks" locks up the CLI.
(related to issue #11080)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@91830 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/utils.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/utils.c b/main/utils.c index 165353edd..e464f7284 100644 --- a/main/utils.c +++ b/main/utils.c @@ -820,6 +820,7 @@ static void *dummy_start(void *data) struct thr_arg a = *((struct thr_arg *) data); /* make a local copy */ #ifdef DEBUG_THREADS struct thr_lock_info *lock_info; + pthread_mutexattr_t mutex_attr; #endif /* note that even though data->name is a pointer to allocated memory, @@ -837,7 +838,11 @@ static void *dummy_start(void *data) lock_info->thread_id = pthread_self(); lock_info->thread_name = strdup(a.name); - pthread_mutex_init(&lock_info->lock, NULL); + + pthread_mutexattr_init(&mutex_attr); + pthread_mutexattr_settype(&mutex_attr, AST_MUTEX_KIND); + pthread_mutex_init(&lock_info->lock, &mutex_attr); + pthread_mutexattr_destroy(&mutex_attr); pthread_mutex_lock(&lock_infos_lock.mutex); /* Intentionally not the wrapper */ AST_LIST_INSERT_TAIL(&lock_infos, lock_info, entry); |