From 69faddccba0bbc0dcc2b43dfeb7172014ca6891a Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 16 Dec 2008 19:53:46 +0000 Subject: [PATCH] Mon Dec 8 08:59:04 CST 2008 Pekka Pessi * su: removed private functions accidentally declared as globals su_t64_to_time(), mutex_trylocker(), su_port_set_system_preferences() git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10814 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/.update | 2 +- .../sofia-sip/libsofia-sip-ua/su/smoothsort.c | 2 ++ .../libsofia-sip-ua/su/sofia-sip/su_time.h | 21 ++++++++++++------- .../libsofia-sip-ua/su/su_alloc_lock.c | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_port.c | 1 + libs/sofia-sip/libsofia-sip-ua/su/su_port.h | 2 ++ libs/sofia-sip/libsofia-sip-ua/su/su_root.c | 14 +++++++------ libs/sofia-sip/libsofia-sip-ua/su/su_time.c | 3 +++ 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index dd8c028414..484e0c547d 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Tue Dec 16 13:51:53 CST 2008 +Tue Dec 16 13:52:51 CST 2008 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c b/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c index ba46ee83ac..1ef31a7e8c 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/smoothsort.c @@ -37,6 +37,8 @@ #include "config.h" +#include + #include #include #include diff --git a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h index bb991a1deb..b4acba6a7d 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h +++ b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_time.h @@ -111,6 +111,19 @@ SOFIAPUBFUN uint32_t su_ntp_mw(su_ntp_t ntp); SOFIAPUBFUN uint32_t su_ntp_fraq(su_time_t t); SOFIAPUBFUN uint32_t su_time_ms(su_time_t t); #else +su_inline uint32_t su_ntp_fraq(su_time_t t); +su_inline uint32_t su_time_ms(su_time_t t); +#endif + +SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo); + +SOFIAPUBFUN uint64_t su_counter(void); + +SOFIAPUBFUN uint64_t su_nanocounter(void); + +SOFIAPUBFUN uint32_t su_random(void); + +#if SU_HAVE_INLINE /** Middle 32 bit of NTP timestamp. */ su_inline uint32_t su_ntp_fraq(su_time_t t) { @@ -129,14 +142,6 @@ su_inline uint32_t su_time_ms(su_time_t t) } #endif -SOFIAPUBFUN su_ntp_t su_ntp_hilo(uint32_t hi, uint32_t lo); - -SOFIAPUBFUN uint64_t su_counter(void); - -SOFIAPUBFUN uint64_t su_nanocounter(void); - -SOFIAPUBFUN uint32_t su_random(); - SOFIA_END_DECLS #endif /* !defined(SU_TIME_H) */ diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c b/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c index bdb4feba7d..d36be89754 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_alloc_lock.c @@ -57,7 +57,7 @@ static int mutex_locker(void *_mutex) return pthread_mutex_lock(mutex + 1); } -int mutex_trylocker(void *_mutex) +static int mutex_trylocker(void *_mutex) { pthread_mutex_t *mutex = _mutex; return pthread_mutex_trylock(mutex + 1); diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_port.c b/libs/sofia-sip/libsofia-sip-ua/su/su_port.c index d9df350a4f..17f37fa2a3 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_port.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_port.c @@ -106,6 +106,7 @@ void su_port_prefer(su_port_create_f *create, if (start) preferred_su_clone_start = start; } +static void su_port_set_system_preferences(char const *name) { su_port_create_f *create = preferred_su_port_create; diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_port.h b/libs/sofia-sip/libsofia-sip-ua/su/su_port.h index 03775eb64e..71d8630e95 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_port.h +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_port.h @@ -168,6 +168,8 @@ SOFIAPUBFUN su_root_t *su_root_create_with_port(su_root_magic_t *magic, SOFIAPUBFUN char const *su_port_name(su_port_t const *port); +SOFIAPUBFUN int su_timer_reset_all(su_timer_queue_t *, su_task_r ); + /* ---------------------------------------------------------------------- */ /* React to multiple events per one poll() to make sure diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_root.c b/libs/sofia-sip/libsofia-sip-ua/su/su_root.c index 9aba660c2e..af5d638499 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_root.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_root.c @@ -115,6 +115,14 @@ struct su_root_s; * Contains hint of number of sockets supported by su_root_t */ int su_root_size_hint = 64; +/* ====================================================================== */ + +_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port); +int su_task_attach(su_task_r self, su_root_t *root); +int su_task_detach(su_task_r self); + +int su_timer_reset_all(su_timer_t **t0, su_task_r); + /* ========================================================================= * Tasks */ @@ -348,12 +356,6 @@ int su_task_execute(su_task_r const task, } } -_su_task_r su_task_new(su_task_r task, su_root_t *root, su_port_t *port); -int su_task_attach(su_task_r self, su_root_t *root); -int su_task_detach(su_task_r self); - -int su_timer_reset_all(su_timer_t **t0, su_task_r); - /* Note that is *not* necessary same as su_root_t, * as su_root_t can be extended */ diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_time.c b/libs/sofia-sip/libsofia-sip-ua/su/su_time.c index fa043fcdc4..2326bfaba8 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_time.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_time.c @@ -202,6 +202,8 @@ su_duration_t su_duration(su_time_t const t1, su_time_t const t2) typedef uint64_t su_t64_t; /* time with 64 bits */ +static su_time_t su_t64_to_time(su_t64_t const us); + const uint32_t su_res32 = 1000000UL; const su_t64_t su_res64 = (su_t64_t)1000000UL; @@ -307,6 +309,7 @@ uint32_t su_ntp_mw(su_ntp_t ntp) return (uint32_t) (ntp >> 16) & 0xffffffffLU; } +static su_time_t su_t64_to_time(su_t64_t const us) { su_time_t tv;