summaryrefslogtreecommitdiff
path: root/cdr.c
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-02-10 20:40:00 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-02-10 20:40:00 +0000
commitcadfcdfe8ebba81a707eb3aeb8dab5b0d9ba3fbb (patch)
tree45f0888fe34c2578dce127e410be849724eaa2a0 /cdr.c
parentb40bd71a9a561945c6cabfb614d71f8bb27c927d (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: https://origsvn.digium.com/svn/asterisk/trunk@9405 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cdr.c')
-rw-r--r--cdr.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/cdr.c b/cdr.c
index 2744e2749..43ec91b1d 100644
--- a/cdr.c
+++ b/cdr.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>
*
@@ -1181,8 +1181,6 @@ static int do_reload(void)
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);