Changeset 2308

Timestamp:

Sep 23, 2008 9:40:11 AM (16 years ago)

Author:

bennylp

Message:

More ticket #622: some more fixes to ioqueue_epoll, it passes pjlib-test now (thanks Simon Chen for the patch!)

File:

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

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

@@ -1 +1 @@
 /* $Id$ */
 /* 
- * Copyright (C)2003-2008 Benny Prijono <benny@prijono.org>
+ * Copyright (C)2003-2007 Benny Prijono <benny@prijono.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -172 +172 @@
 
     unsigned            max, count;
-    pj_ioqueue_key_t    hlist;
+    //pj_ioqueue_key_t  hlist;
+    pj_ioqueue_key_t    active_list;    
     int                 epfd;
-    struct epoll_event *events;
-    struct queue       *queue;
+    //struct epoll_event *events;
+    //struct queue       *queue;
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
     pj_mutex_t         *ref_cnt_mutex;
-    pj_ioqueue_key_t    active_list;
     pj_ioqueue_key_t    closing_list;
     pj_ioqueue_key_t    free_list;
@@ -235 +235 @@
     ioqueue->max = max_fd;
     ioqueue->count = 0;
-    pj_list_init(&ioqueue->hlist);
+    pj_list_init(&ioqueue->active_list);
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -254 +254 @@
     pj_list_init(&ioqueue->free_list);
     pj_list_init(&ioqueue->closing_list);
-    pj_list_init(&ioqueue->active_list);
 
 
@@ -292 +291 @@
     }
     
-    ioqueue->events = pj_pool_calloc(pool, max_fd, sizeof(struct epoll_event));
+    /*ioqueue->events = pj_pool_calloc(pool, max_fd, sizeof(struct epoll_event));
     PJ_ASSERT_RETURN(ioqueue->events != NULL, PJ_ENOMEM);
 
     ioqueue->queue = pj_pool_calloc(pool, max_fd, sizeof(struct queue));
     PJ_ASSERT_RETURN(ioqueue->queue != NULL, PJ_ENOMEM);
-
+   */
     PJ_LOG(4, ("pjlib", "epoll I/O Queue created (%p)", ioqueue));
 
@@ -432 +431 @@
     
     /* Register */
-    pj_list_insert_before(&ioqueue->hlist, key);
+    pj_list_insert_before(&ioqueue->active_list, key);
     ++ioqueue->count;
 
@@ -608 +607 @@
     int i, count, processed;
     int msec;
-    struct epoll_event *events = ioqueue->events;
-    struct queue *queue = ioqueue->queue;
+    //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];
     pj_timestamp t1, t2;
     
@@ -619 +620 @@
     pj_get_timestamp(&t1);
  
-    count = os_epoll_wait( ioqueue->epfd, events, ioqueue->max, msec);
+    //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);
     if (count == 0) {
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -656 +658 @@
          */
         if ((events[i].events & EPOLLIN) && 
-            (key_has_pending_read(h) || key_has_pending_accept(h))) {
+            (key_has_pending_read(h) || key_has_pending_accept(h)) && !IS_CLOSING(h) ) {
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -669 +671 @@
          * Check for writeability.
          */
-        if ((events[i].events & EPOLLOUT) && key_has_pending_write(h)) {
+        if ((events[i].events & EPOLLOUT) && key_has_pending_write(h) && !IS_CLOSING(h)) {
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -683 +685 @@
          * Check for completion of connect() operation.
          */
-        if ((events[i].events & EPOLLOUT) && (h->connecting)) {
+        if ((events[i].events & EPOLLOUT) && (h->connecting) && !IS_CLOSING(h)) {
 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG
@@ -697 +699 @@
          * Check for error condition.
          */
-        if (events[i].events & EPOLLERR && (h->connecting)) {
+        if (events[i].events & EPOLLERR && (h->connecting) && !IS_CLOSING(h)) {
                 
 #if PJ_IOQUEUE_HAS_SAFE_UNREG