Changeset 2984 for pjproject/trunk

Timestamp:

Nov 4, 2009 4:24:33 AM (15 years ago)

Author:

bennylp

Message:

Fixed ticket #975: Symbian timer heap implementation unable to schedule duration more than 2100 seconds (thanks Nir Elkayam for the report)

File:

• pjproject/trunk/pjlib/src/pj/timer_symbian.cpp (modified) (6 diffs)

pjproject/trunk/pjlib/src/pj/timer_symbian.cpp

@@ -29 +29 @@
 #define DEFAULT_MAX_TIMED_OUT_PER_POLL  (64)
 
+// Maximum number of miliseconds that RTimer.At() supports
+#define MAX_RTIMER_INTERVAL             2147
+
 
 /**
@@ -66 +69 @@
     pj_timer_entry  *entry_;
     RTimer           rtimer_;
+    pj_uint32_t      interval_left_;
     
     CPjTimerEntry(pj_timer_heap_t *timer_heap, pj_timer_entry *entry);
     void ConstructL(const pj_time_val *delay);
+    void Schedule();
 };
 
@@ -74 +79 @@
 CPjTimerEntry::CPjTimerEntry(pj_timer_heap_t *timer_heap,
                              pj_timer_entry *entry)
-: CActive(PJ_SYMBIAN_TIMER_PRIORITY), timer_heap_(timer_heap), entry_(entry)
+: CActive(PJ_SYMBIAN_TIMER_PRIORITY), timer_heap_(timer_heap), entry_(entry),
+  interval_left_(0)
 {
 }
@@ -84 +90 @@
 }
 
+void CPjTimerEntry::Schedule()
+{
+    pj_int32_t interval;
+    
+    if (interval_left_ > MAX_RTIMER_INTERVAL) {
+        interval = MAX_RTIMER_INTERVAL;
+    } else {
+        interval = interval_left_;
+    }
+    
+    interval_left_ -= interval;
+    rtimer_.After(iStatus, interval * 1000);
+    SetActive();
+}
+
 void CPjTimerEntry::ConstructL(const pj_time_val *delay) 
 {
@@ -89 +110 @@
     CActiveScheduler::Add(this);
     
-    pj_int32_t interval = PJ_TIME_VAL_MSEC(*delay) * 1000;
-    if (interval < 0) {
-        interval = 0;
-    }
-    rtimer_.After(iStatus, interval);
-    SetActive();
+    interval_left_ = PJ_TIME_VAL_MSEC(*delay);
+    Schedule();
 }
 
@@ -111 +128 @@
 void CPjTimerEntry::RunL() 
 {
+    if (interval_left_ > 0) {
+        Schedule();
+        return;
+    }
+    
     --timer_heap_->cur_size;
     entry_->_timer_id = NULL;