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

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 3492a19f0177e44fe6d3a985ceb41314d8af7cc2..7bff30d8213912054df8b4448a92e57382e9a20f 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Feb 11 11:18:53 CST 2009
+Wed Feb 11 11:19:18 CST 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
index f9467e49f3b26a22e64d1dad5a1e40801d7dfee5..795da9f31424d23a65eacedacb618f68de71dec9 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
+++ b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/su_source.c
@@ -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_tout = (tout >= 0 && tout <= (su_duration_t)G_MAXINT)?
+      (gint)tout : -1;
 
-  return FALSE;
+  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