kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Wed Jan 28 12:20:34 CST 2009 Mikhail Zabaluev <mikhail.zabaluev@nokia.com> 

* Added deferrable timer support to the GSource integration.
  


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11857 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-11 17:19:25 +00:00
parent 48c52ad5ec
commit a37b99f072
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Feb 11 11:18:53 CST 2009
Wed Feb 11 11:19:18 CST 2009

22
libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
View File

@ -377,6 +377,7 @@ gboolean su_source_prepare(GSource *gs, gint *return_tout)
{
SuSource *ss = (SuSource *)gs;
su_port_t *self = ss->ss_port;
su_duration_t tout = SU_WAIT_FOREVER;
enter;
@ -388,21 +389,22 @@ gboolean su_source_prepare(GSource *gs, gint *return_tout)
if (self->sup_base->sup_timers) {
su_time_t now;
GTimeVal gtimeval;
su_duration_t tout;
g_source_get_current_time(gs, &gtimeval);
now.tv_sec = gtimeval.tv_sec + 2208988800UL;
now.tv_usec = gtimeval.tv_usec;
tout = su_timer_next_expires(&self->sup_base->sup_timers, now);
*return_tout = (tout < 0 || tout > (su_duration_t)G_MAXINT)?
-1 : (gint)tout;
return (tout == 0);
}
if (self->sup_base->sup_deferrable) {
if (tout > self->sup_base->sup_max_defer)
tout = self->sup_base->sup_max_defer;
}
return FALSE;
*return_tout = (tout >= 0 && tout <= (su_duration_t)G_MAXINT)?
(gint)tout : -1;
return (tout == 0);
}
static
@ -440,11 +442,10 @@ gboolean su_source_dispatch(GSource *gs,
if (self->sup_base->sup_head)
su_base_port_getmsgs(self);
if (self->sup_base->sup_timers) {
if (self->sup_base->sup_timers || self->sup_base->sup_deferrable) {
su_time_t now;
GTimeVal gtimeval;
su_duration_t tout;
int timers = 0;
tout = SU_DURATION_MAX;
@ -453,7 +454,8 @@ gboolean su_source_dispatch(GSource *gs,
now.tv_sec = gtimeval.tv_sec + 2208988800UL;
now.tv_usec = gtimeval.tv_usec;
timers = su_timer_expire(&self->sup_base->sup_timers, &tout, now);
su_timer_expire(&self->sup_base->sup_timers, &tout, now);
su_timer_expire(&self->sup_base->sup_deferrable, &tout, now);
}
#if SU_HAVE_POLL