[asterisk-commits] branch 1.2 r9528 - in /branches/1.2: cdr.c
channels/chan_sip.c
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Feb 11 08:22:56 MST 2006
Author: kpfleming
Date: Sat Feb 11 09:22:55 2006
New Revision: 9528
URL: http://svn.digium.com/view/asterisk?rev=9528&view=rev
Log:
clean up my mess from thread-starting change
Modified:
branches/1.2/cdr.c
branches/1.2/channels/chan_sip.c
Modified: branches/1.2/cdr.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/cdr.c?rev=9528&r1=9527&r2=9528&view=diff
==============================================================================
--- branches/1.2/cdr.c (original)
+++ branches/1.2/cdr.c Sat Feb 11 09:22:55 2006
@@ -1136,7 +1136,6 @@
int was_enabled;
int was_batchmode;
int res=0;
- pthread_attr_t attr;
ast_mutex_lock(&cdr_batch_lock);
@@ -1197,7 +1196,7 @@
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
- if (ast_pthread_create(&cdr_thread, &attr, do_cdr, NULL) < 0) {
+ if (ast_pthread_create(&cdr_thread, NULL, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
} else {
Modified: branches/1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?rev=9528&r1=9527&r2=9528&view=diff
==============================================================================
--- branches/1.2/channels/chan_sip.c (original)
+++ branches/1.2/channels/chan_sip.c Sat Feb 11 09:22:55 2006
@@ -11324,7 +11324,6 @@
/*! \brief restart_monitor: Start the channel monitor thread ---*/
static int restart_monitor(void)
{
- pthread_attr_t attr;
/* If we're supposed to be stopped -- stay stopped */
if (monitor_thread == AST_PTHREADT_STOP)
return 0;
More information about the asterisk-commits
mailing list