kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't use pthread_mutex_lock

Browse Source 
don't double-include pthread.h in utils.h, which can cause the
pthread_mutex_lock warning to not be generated on some systems


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-14 14:45:51 +00:00
parent fb12b92a43
commit 86511f89fb
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cdr.c
View File

@@ -940,9 +940,9 @@ static void submit_unscheduled_batch(void)
/* schedule the submission to occur ASAP (1 ms) */
cdr_sched = ast_sched_add(sched, 1, submit_scheduled_batch, NULL);
/* signal the do_cdr thread to wakeup early and do some work (that lazy thread ;) */
pthread_mutex_lock(&cdr_pending_lock);
ast_mutex_lock(&cdr_pending_lock);
pthread_cond_signal(&cdr_pending_cond);
pthread_mutex_unlock(&cdr_pending_lock);
ast_mutex_unlock(&cdr_pending_lock);
}
void ast_cdr_detach(struct ast_cdr *cdr)
@@ -1017,10 +1017,10 @@ static void *do_cdr(void *data)
timeout.tv_sec = now.tv_sec + (schedms / 1000);
timeout.tv_nsec = (now.tv_usec * 1000) + ((schedms % 1000) * 1000);
/* prevent stuff from clobbering cdr_pending_cond, then wait on signals sent to it until the timeout expires */
pthread_mutex_lock(&cdr_pending_lock);
ast_mutex_lock(&cdr_pending_lock);
pthread_cond_timedwait(&cdr_pending_cond, &cdr_pending_lock, &timeout);
numevents = ast_sched_runq(sched);
pthread_mutex_unlock(&cdr_pending_lock);
ast_mutex_unlock(&cdr_pending_lock);
if (option_debug > 1)
ast_log(LOG_DEBUG, "Processed %d scheduled CDR batches from the run queue\n", numevents);
}

1
include/asterisk/utils.h
View File

@@ -19,7 +19,6 @@
#include <netinet/in.h>
#include <arpa/inet.h> /* we want to override inet_ntoa */
#include <netdb.h>
#include <pthread.h>
#include <limits.h>
#include "asterisk/lock.h"