summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2009-06-25 13:18:36 +0000
committerBenny Prijono <bennylp@teluu.com>2009-06-25 13:18:36 +0000
commitd749012c94efaf397371b2294618465ec00fea08 (patch)
treeb8d45f5bd3932883ab1601e0312f7c281ef21319
parentddf148b359afe03ae1aaac5bbf6252fb072c9be8 (diff)
Ticket #900: pjlib-test failed on timer heap test on Symbian S60 3rd Edition MR
- backported changes in #893 git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.0@2817 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjlib/src/pjlib-test/timer.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/pjlib/src/pjlib-test/timer.c b/pjlib/src/pjlib-test/timer.c
index d13e3303..1ee05db7 100644
--- a/pjlib/src/pjlib-test/timer.c
+++ b/pjlib/src/pjlib-test/timer.c
@@ -139,7 +139,16 @@ static int test_timer_heap(void)
pj_gettimeofday(&now);
pj_get_timestamp(&t1);
+#if defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
+ /* On Symbian, we must use OS poll (Active Scheduler poll) since
+ * timer is implemented using Active Object.
+ */
+ rc = 0;
+ while (pj_symbianos_poll(-1, 0))
+ ++rc;
+#else
rc = pj_timer_heap_poll(timer, NULL);
+#endif
pj_get_timestamp(&t2);
if (rc > 0) {
done += rc;