Changeset 1246 for pjproject/trunk/pjlib/src/pj/ioqueue_symbian.cpp

Timestamp:

May 3, 2007 1:31:21 PM (17 years ago)

Author:

bennylp

Message:

Implemented ticket #246, #247, #261, #268, #250 for Symbian

File:

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

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

@@ -35 +35 @@
 {
     int              eventCount;
-    CPjTimeoutTimer *timeoutTimer;
 };
 
@@ -439 +438 @@
     PJ_UNUSED_ARG(max_fd);
 
-    ioq = (pj_ioqueue_t*) pj_pool_zalloc(pool, sizeof(pj_ioqueue_t));
-    ioq->timeoutTimer = CPjTimeoutTimer::NewL();
+    ioq = PJ_POOL_ZALLOC_T(pool, pj_ioqueue_t);
     *p_ioqueue = ioq;
     return PJ_SUCCESS;
@@ -451 +449 @@
 PJ_DEF(pj_status_t) pj_ioqueue_destroy( pj_ioqueue_t *ioq )
 {
-    delete ioq->timeoutTimer;
-    ioq->timeoutTimer = NULL;
-
+    PJ_UNUSED_ARG(ioq);
     return PJ_SUCCESS;
 }
@@ -488 +484 @@
     pj_ioqueue_key_t *key;
 
-    key = (pj_ioqueue_key_t*) pj_pool_zalloc(pool, sizeof(pj_ioqueue_key_t));
+    key = PJ_POOL_ZALLOC_T(pool, pj_ioqueue_key_t);
     key->cbObj = CIoqueueCallback::NewL(ioq, key, sock, cb, user_data);
 
@@ -553 +549 @@
                                      pj_size_t size )
 {
-    pj_memset(op_key, 0, size);
+    pj_bzero(op_key, size);
 }
 
@@ -635 +631 @@
                              const pj_time_val *timeout)
 {
-    CPjTimeoutTimer *timer;
-
-    if (timeout) {
-        //if (!ioq->timeoutTimer->IsActive())
-        if (0)
-            timer = ioq->timeoutTimer;
-        else
-            timer = CPjTimeoutTimer::NewL();
-
-        timer->StartTimer(timeout->sec*1000 + timeout->msec);
-
-    } else {
-        timer = NULL;
-    }
-
-    ioq->eventCount = 0;
-
-    do {
-        PjSymbianOS::Instance()->WaitForActiveObjects();
-    } while (ioq->eventCount == 0 && (!timer || (timer && !timer->HasTimedOut())));
-
-    if (timer && !timer->HasTimedOut())
-        timer->Cancel();
-
-    if (timer && timer != ioq->timeoutTimer)
-        delete timer;
-
-    return ioq->eventCount;
+    /* Polling is not necessary on Symbian, since all async activities
+     * are registered to active scheduler.
+     */
+    PJ_UNUSED_ARG(ioq);
+    PJ_UNUSED_ARG(timeout);
+    return 0;
 }