kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-13 07:45:26 +00:00
Code Issues Projects Releases Wiki Activity

timer mojo (cont)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4151 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-02-07 19:18:15 +00:00
parent e216bbe095
commit cb587626ea
5 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_core.h
View File

@ -905,10 +905,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer);
/*!
\brief Check if the current step has been exceeded
\param timer the timer to wait on
\param diff the remaining number of ms
\return the newest sample count
*/
SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer, uint32_t *diff);
SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer);
/*!
\brief Destroy an allocated timer

2
src/include/switch_module_interfaces.h
View File

@ -245,7 +245,7 @@ struct switch_timer_interface {
/*! function to step the timer one step */
switch_status_t (*timer_step)(switch_timer_t *);
/*! function to check if the current step has expired */
switch_status_t (*timer_check)(switch_timer_t *, uint32_t *);
switch_status_t (*timer_check)(switch_timer_t *);
/*! function to deallocate the timer */
switch_status_t (*timer_destroy)(switch_timer_t *);
const struct switch_timer_interface *next;

29
src/mod/timers/mod_softtimer/mod_softtimer.c
View File

@ -78,11 +78,8 @@ static inline switch_status_t timer_step(switch_timer_t *timer)
{
timer_private_t *private_info = timer->private_info;
while(private_info->reference <= TIMER_MATRIX[timer->interval].tick) {
private_info->reference += timer->interval;
}
return SWITCH_STATUS_SUCCESS;
private_info->reference += timer->interval;
return SWITCH_STATUS_SUCCESS;
}
@ -93,41 +90,31 @@ static inline switch_status_t timer_next(switch_timer_t *timer)
timer_step(timer);
while (TIMER_MATRIX[timer->interval].tick < private_info->reference) {
uint64_t diff;
if ((diff = (private_info->reference - TIMER_MATRIX[timer->interval].tick))) {
if (diff == timer->interval) {
switch_yield(diff * 500);
} else {
switch_yield(1000);
}
} else {
break;
}
switch_yield(timer->interval * 500);
}
timer->samplecount += timer->samples;
return SWITCH_STATUS_SUCCESS;
}
static inline switch_status_t timer_check(switch_timer_t *timer, uint32_t *diff)
static inline switch_status_t timer_check(switch_timer_t *timer)
{
timer_private_t *private_info = timer->private_info;
switch_status_t status = SWITCH_STATUS_SUCCESS;
uint64_t diff;
if (TIMER_MATRIX[timer->interval].tick < private_info->reference) {
uint64_t _diff = private_info->reference - TIMER_MATRIX[timer->interval].tick;
*diff = (uint32_t) _diff;
diff = private_info->reference - TIMER_MATRIX[timer->interval].tick;
} else {
*diff = 0;
diff = 0;
}
if (*diff) {
if (diff) {
status = SWITCH_STATUS_FALSE;
} else {
timer_step(timer);
}
return status;
}

4
src/switch_core.c
View File

@ -1321,14 +1321,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_timer_step(switch_timer_t *timer)
return timer->timer_interface->timer_step(timer);
}
SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer, uint32_t *diff)
SWITCH_DECLARE(switch_status_t) switch_core_timer_check(switch_timer_t *timer)
{
if (!timer->timer_interface) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer is not initilized!\n");
return SWITCH_STATUS_GENERR;
}
return timer->timer_interface->timer_check(timer, diff);
return timer->timer_interface->timer_check(timer);
}

5
src/switch_rtp.c
View File

@ -711,7 +711,6 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
switch_size_t bytes = 0;
switch_status_t status;
uint8_t check = 1;
uint32_t diff = 0;
if (!rtp_session->timer.interval) {
rtp_session->last_time = switch_time_now();
@ -758,7 +757,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
}
if (rtp_session->timer.interval) {
check = (uint8_t)(switch_core_timer_check(&rtp_session->timer, &diff) == SWITCH_STATUS_SUCCESS);
check = (uint8_t)(switch_core_timer_check(&rtp_session->timer) == SWITCH_STATUS_SUCCESS);
}
if (check) {
@ -781,7 +780,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
if (status == SWITCH_STATUS_BREAK || bytes == 0) {
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) {
switch_yield(diff * 500);
switch_yield((rtp_session->ms_per_packet / 1000) * 750);
continue;
}
return 0;