From fa4a1c43175f639678d47732b20574e200843792 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 17 Sep 2006 22:13:51 +0000 Subject: [PATCH] tweak softimer to not int type truncate microsecond interval time.c git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2728 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_apr.h | 3 +++ src/include/switch_utils.h | 2 +- src/mod/timers/mod_softtimer/mod_softtimer.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h index ffb0cc5a49..d7bd63d896 100644 --- a/src/include/switch_apr.h +++ b/src/include/switch_apr.h @@ -1053,6 +1053,9 @@ DoxyDefine(apr_status_t switch_poll(switch_pollfd_t *aprset, apr_int32_t numsock /** number of microseconds since 00:00:00 january 1, 1970 UTC */ typedef apr_time_t switch_time_t; + /** number of microseconds in the interval */ +typedef apr_interval_time_t switch_interval_time_t; + /** * a structure similar to ANSI struct tm with the following differences: * - tm_usec isn't an ANSI field diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h index dd6957df34..d8b9774af0 100644 --- a/src/include/switch_utils.h +++ b/src/include/switch_utils.h @@ -169,7 +169,7 @@ switch_mutex_unlock(obj->flag_mutex); #ifdef HAVE_USLEEP #define switch_yield(ms) usleep(ms); #else -#define switch_yield(ms) apr_sleep(ms * 10); //apr_thread_yield(); +#define switch_yield(ms) apr_sleep((ms) * 10); //apr_thread_yield(); #endif /*! diff --git a/src/mod/timers/mod_softtimer/mod_softtimer.c b/src/mod/timers/mod_softtimer/mod_softtimer.c index 2b0d28d5a0..dc5fc130b3 100644 --- a/src/mod/timers/mod_softtimer/mod_softtimer.c +++ b/src/mod/timers/mod_softtimer/mod_softtimer.c @@ -38,7 +38,7 @@ static struct { int32_t RUNNING; switch_mutex_t *mutex; uint32_t timer_milliseconds; - uint32_t timer_microseconds; + switch_interval_time_t timer_microseconds; } globals; static const char modname[] = "mod_softtimer";