kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trim trailing whitespace so that I can work on this bug without it bothering me. :-)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197960 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-05-29 16:15:30 +00:00
parent 14d05f57d7
commit 5894cefe1f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/res_timing_pthread.c
View File

@@ -16,11 +16,11 @@
* at the top of the source tree. * at the top of the source tree.
*/ */
/*! /*!
* \file * \file
* \author Russell Bryant <russell@digium.com> * \author Russell Bryant <russell@digium.com>
* *
* \brief pthread timing interface * \brief pthread timing interface
*/ */
#include "asterisk.h" #include "asterisk.h"
@@ -186,7 +186,7 @@ static int pthread_timer_set_rate(int handle, unsigned int rate)
if (timer->state != TIMER_STATE_CONTINUOUS) { if (timer->state != TIMER_STATE_CONTINUOUS) {
set_state(timer); set_state(timer);
} }
ao2_unlock(timer); ao2_unlock(timer);
ao2_ref(timer, -1); ao2_ref(timer, -1);
@@ -311,7 +311,7 @@ static void pthread_timer_destructor(void *obj)
} }
/*! /*!
* \note only PIPE_READ is guaranteed valid * \note only PIPE_READ is guaranteed valid
*/ */
static int pthread_timer_hash(const void *obj, const int flags) static int pthread_timer_hash(const void *obj, const int flags)
{ {
@@ -321,7 +321,7 @@ static int pthread_timer_hash(const void *obj, const int flags)
} }
/*! /*!
* \note only PIPE_READ is guaranteed valid * \note only PIPE_READ is guaranteed valid
*/ */
static int pthread_timer_cmp(void *obj, void *arg, int flags) static int pthread_timer_cmp(void *obj, void *arg, int flags)
{ {
@@ -339,9 +339,9 @@ static int check_timer(struct pthread_timer *timer)
struct timeval now; struct timeval now;
if (timer->state == TIMER_STATE_IDLE || timer->state == TIMER_STATE_CONTINUOUS) { if (timer->state == TIMER_STATE_IDLE || timer->state == TIMER_STATE_CONTINUOUS) {
return 0; return 0;
} }
now = ast_tvnow(); now = ast_tvnow();
if (timer->tick_count < (ast_tvdiff_ms(now, timer->start) / timer->interval)) { if (timer->tick_count < (ast_tvdiff_ms(now, timer->start) / timer->interval)) {
@@ -379,7 +379,7 @@ static void read_pipe(int rd_fd, unsigned int quantity, int clear)
break; break;
} }
res = read(rd_fd, buf, res = read(rd_fd, buf,
(quantity < sizeof(buf)) ? quantity : sizeof(buf)); (quantity < sizeof(buf)) ? quantity : sizeof(buf));
if (res == -1) { if (res == -1) {
@@ -404,7 +404,7 @@ static void write_byte(int wr_fd)
ssize_t res; ssize_t res;
unsigned char x = 42; unsigned char x = 42;
res = write(wr_fd, &x, 1); res = write(wr_fd, &x, 1);
if (res == -1) { if (res == -1) {
if (errno == EAGAIN) { if (errno == EAGAIN) {
@@ -428,7 +428,7 @@ static int run_timer(void *obj, void *arg, int flags)
if (check_timer(timer)) { if (check_timer(timer)) {
write_byte(timer->pipe[PIPE_WRITE]); write_byte(timer->pipe[PIPE_WRITE]);
} }
ao2_unlock(timer); ao2_unlock(timer);
return 0; return 0;
@@ -477,7 +477,7 @@ static int init_timing_thread(void)
static int load_module(void) static int load_module(void)
{ {
if (!(pthread_timers = ao2_container_alloc(PTHREAD_TIMER_BUCKETS, if (!(pthread_timers = ao2_container_alloc(PTHREAD_TIMER_BUCKETS,
pthread_timer_hash, pthread_timer_cmp))) { pthread_timer_hash, pthread_timer_cmp))) {
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }