diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-10 20:40:00 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-10 20:40:00 +0000 |
| commit | e04e114ef1d44809af33eb916be88c1f137b03b8 (patch) | |
| tree | 45f0888fe34c2578dce127e410be849724eaa2a0 /devicestate.c | |
| parent | 3106171e09aacb05e745922a7c9c3205279ab7f8 (diff) | |
Merged revisions 9404 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r9404 | kpfleming | 2006-02-10 14:38:59 -0600 (Fri, 10 Feb 2006) | 2 lines
don't create monitor threads in detached mode, when we need to be able to pthread_join() them later if the module is unloaded (solve crash-on-unload problem for these channel modules)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@9405 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'devicestate.c')
| -rw-r--r-- | devicestate.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/devicestate.c b/devicestate.c index 93200a9c0..4131503c8 100644 --- a/devicestate.c +++ b/devicestate.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -265,12 +265,8 @@ static void *do_devstate_changes(void *data) /*! \brief Initialize the device state engine in separate thread */ int ast_device_state_engine_init(void) { - pthread_attr_t attr; - ast_cond_init(&change_pending, NULL); - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - if (ast_pthread_create(&change_thread, &attr, do_devstate_changes, NULL) < 0) { + if (ast_pthread_create(&change_thread, NULL, do_devstate_changes, NULL) < 0) { ast_log(LOG_ERROR, "Unable to start device state change thread.\n"); return -1; } |