Changeset 5194 for pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c

Timestamp:

Nov 6, 2015 4:18:46 AM (8 years ago)

Author:

nanang

Message:

Close #1894: Improve ioqueue performance on multithreadeded environment.

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c (modified) (10 diffs)

pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c

@@ -652 +652 @@
 PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout)
 {
-    int i, count, processed;
+    int i, count, event_cnt, processed_cnt;
     int msec;
     //struct epoll_event *events = ioqueue->events;
     //struct queue *queue = ioqueue->queue;
-    struct epoll_event events[PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL];
-    struct queue queue[PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL];
+    enum { MAX_EVENTS = PJ_IOQUEUE_MAX_CAND_EVENTS };
+    struct epoll_event events[MAX_EVENTS];
+    struct queue queue[MAX_EVENTS];
     pj_timestamp t1, t2;
     
@@ -668 +669 @@
  
     //count = os_epoll_wait( ioqueue->epfd, events, ioqueue->max, msec);
-    count = os_epoll_wait( ioqueue->epfd, events, PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL, msec);
+    count = os_epoll_wait( ioqueue->epfd, events, MAX_EVENTS, msec);
     if (count == 0) {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -695 +696 @@
     pj_lock_acquire(ioqueue->lock);
 
-    for (processed=0, i=0; i<count; ++i) {
+    for (event_cnt=0, i=0; i<count; ++i) {
         pj_ioqueue_key_t *h = (pj_ioqueue_key_t*)(epoll_data_type)
                                 events[i].epoll_data;
@@ -710 +711 @@
             increment_counter(h);
 #endif
-            queue[processed].key = h;
-            queue[processed].event_type = READABLE_EVENT;
-            ++processed;
+            queue[event_cnt].key = h;
+            queue[event_cnt].event_type = READABLE_EVENT;
+            ++event_cnt;
             continue;
         }
@@ -724 +725 @@
             increment_counter(h);
 #endif
-            queue[processed].key = h;
-            queue[processed].event_type = WRITEABLE_EVENT;
-            ++processed;
+            queue[event_cnt].key = h;
+            queue[event_cnt].event_type = WRITEABLE_EVENT;
+            ++event_cnt;
             continue;
         }
@@ -739 +740 @@
             increment_counter(h);
 #endif
-            queue[processed].key = h;
-            queue[processed].event_type = WRITEABLE_EVENT;
-            ++processed;
+            queue[event_cnt].key = h;
+            queue[event_cnt].event_type = WRITEABLE_EVENT;
+            ++event_cnt;
             continue;
         }
@@ -759 +760 @@
                 increment_counter(h);
 #endif
-                queue[processed].key = h;
-                queue[processed].event_type = EXCEPTION_EVENT;
-                ++processed;
+                queue[event_cnt].key = h;
+                queue[event_cnt].event_type = EXCEPTION_EVENT;
+                ++event_cnt;
             } else if (key_has_pending_read(h) || key_has_pending_accept(h)) {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
                 increment_counter(h);
 #endif
-                queue[processed].key = h;
-                queue[processed].event_type = READABLE_EVENT;
-                ++processed;
+                queue[event_cnt].key = h;
+                queue[event_cnt].event_type = READABLE_EVENT;
+                ++event_cnt;
             }
             continue;
         }
     }
-    for (i=0; i<processed; ++i) {
+    for (i=0; i<event_cnt; ++i) {
         if (queue[i].key->grp_lock)
             pj_grp_lock_add_ref_dbg(queue[i].key->grp_lock, "ioqueue", 0);
@@ -784 +785 @@
     PJ_RACE_ME(5);
 
+    processed_cnt = 0;
+
     /* Now process the events. */
-    for (i=0; i<processed; ++i) {
-        switch (queue[i].event_type) {
-        case READABLE_EVENT:
-            ioqueue_dispatch_read_event(ioqueue, queue[i].key);
-            break;
-        case WRITEABLE_EVENT:
-            ioqueue_dispatch_write_event(ioqueue, queue[i].key);
-            break;
-        case EXCEPTION_EVENT:
-            ioqueue_dispatch_exception_event(ioqueue, queue[i].key);
-            break;
-        case NO_EVENT:
-            pj_assert(!"Invalid event!");
-            break;
-        }
+    for (i=0; i<event_cnt; ++i) {
+
+        /* Just do not exceed PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL */
+        if (processed_cnt < PJ_IOQUEUE_MAX_EVENTS_IN_SINGLE_POLL) {
+            switch (queue[i].event_type) {
+            case READABLE_EVENT:
+                if (ioqueue_dispatch_read_event(ioqueue, queue[i].key))
+                    ++processed_cnt;
+                break;
+            case WRITEABLE_EVENT:
+                if (ioqueue_dispatch_write_event(ioqueue, queue[i].key))
+                    ++processed_cnt;
+                break;
+            case EXCEPTION_EVENT:
+                if (ioqueue_dispatch_exception_event(ioqueue, queue[i].key))
+                    ++processed_cnt;
+                break;
+            case NO_EVENT:
+                pj_assert(!"Invalid event!");
+                break;
+            }
+        }
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -813 +823 @@
      * When epoll returns > 0 but no descriptors are actually set!
      */
-    if (count > 0 && !processed && msec > 0) {
+    if (count > 0 && !event_cnt && msec > 0) {
         pj_thread_sleep(msec);
     }
+
+    TRACE_((THIS_FILE, "     poll: count=%d events=%d processed=%d",
+                       count, event_cnt, processed_cnt));
 
     pj_get_timestamp(&t1);
@@ -821 +834 @@
                        processed, pj_elapsed_usec(&t2, &t1)));
 
-    return processed;
-}
-
+    return processed_cnt;
+}
+