Changeset 592 for pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c

Timestamp:

Jul 8, 2006 7:46:43 PM (18 years ago)

Author:

bennylp

Message:

Attempted to fix epoll for Linux

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_common_abs.c (modified) (13 diffs)

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

@@ -197 +197 @@
         h->connecting = 0;
 
-        ioqueue_remove_from_set(ioqueue, h->fd, WRITEABLE_EVENT);
-        ioqueue_remove_from_set(ioqueue, h->fd, EXCEPTION_EVENT);
+        ioqueue_remove_from_set(ioqueue, h, WRITEABLE_EVENT);
+        ioqueue_remove_from_set(ioqueue, h, EXCEPTION_EVENT);
 
 
@@ -273 +273 @@
 
             if (pj_list_empty(&h->write_list))
-                ioqueue_remove_from_set(ioqueue, h->fd, WRITEABLE_EVENT);
+                ioqueue_remove_from_set(ioqueue, h, WRITEABLE_EVENT);
 
         }
@@ -326 +326 @@
                 /* Clear operation if there's no more data to send. */
                 if (pj_list_empty(&h->write_list))
-                    ioqueue_remove_from_set(ioqueue, h->fd, WRITEABLE_EVENT);
+                    ioqueue_remove_from_set(ioqueue, h, WRITEABLE_EVENT);
 
             }
@@ -379 +379 @@
         /* Clear bit in fdset if there is no more pending accept */
         if (pj_list_empty(&h->accept_list))
-            ioqueue_remove_from_set(ioqueue, h->fd, READABLE_EVENT);
+            ioqueue_remove_from_set(ioqueue, h, READABLE_EVENT);
 
         rc=pj_sock_accept(h->fd, accept_op->accept_fd, 
@@ -412 +412 @@
         /* Clear fdset if there is no pending read. */
         if (pj_list_empty(&h->read_list))
-            ioqueue_remove_from_set(ioqueue, h->fd, READABLE_EVENT);
+            ioqueue_remove_from_set(ioqueue, h, READABLE_EVENT);
 
         bytes_read = read_op->size;
@@ -519 +519 @@
     h->connecting = 0;
 
-    ioqueue_remove_from_set(ioqueue, h->fd, WRITEABLE_EVENT);
-    ioqueue_remove_from_set(ioqueue, h->fd, EXCEPTION_EVENT);
+    ioqueue_remove_from_set(ioqueue, h, WRITEABLE_EVENT);
+    ioqueue_remove_from_set(ioqueue, h, EXCEPTION_EVENT);
 
     pj_mutex_unlock(h->mutex);
@@ -586 +586 @@
     pj_mutex_lock(key->mutex);
     pj_list_insert_before(&key->read_list, read_op);
-    ioqueue_add_to_set(key->ioqueue, key->fd, READABLE_EVENT);
+    ioqueue_add_to_set(key->ioqueue, key, READABLE_EVENT);
     pj_mutex_unlock(key->mutex);
 
@@ -654 +654 @@
     pj_mutex_lock(key->mutex);
     pj_list_insert_before(&key->read_list, read_op);
-    ioqueue_add_to_set(key->ioqueue, key->fd, READABLE_EVENT);
+    ioqueue_add_to_set(key->ioqueue, key, READABLE_EVENT);
     pj_mutex_unlock(key->mutex);
 
@@ -760 +760 @@
     pj_mutex_lock(key->mutex);
     pj_list_insert_before(&key->write_list, write_op);
-    ioqueue_add_to_set(key->ioqueue, key->fd, WRITEABLE_EVENT);
+    ioqueue_add_to_set(key->ioqueue, key, WRITEABLE_EVENT);
     pj_mutex_unlock(key->mutex);
 
@@ -828 +828 @@
             status = status;
         }
+        PJ_LOG(3,(THIS_FILE, "pending write operation!!"));
     }
 
@@ -877 +878 @@
     pj_mutex_lock(key->mutex);
     pj_list_insert_before(&key->write_list, write_op);
-    ioqueue_add_to_set(key->ioqueue, key->fd, WRITEABLE_EVENT);
+    ioqueue_add_to_set(key->ioqueue, key, WRITEABLE_EVENT);
     pj_mutex_unlock(key->mutex);
 
@@ -946 +947 @@
     pj_mutex_lock(key->mutex);
     pj_list_insert_before(&key->accept_list, accept_op);
-    ioqueue_add_to_set(key->ioqueue, key->fd, READABLE_EVENT);
+    ioqueue_add_to_set(key->ioqueue, key, READABLE_EVENT);
     pj_mutex_unlock(key->mutex);
 
@@ -982 +983 @@
             pj_mutex_lock(key->mutex);
             key->connecting = PJ_TRUE;
-            ioqueue_add_to_set(key->ioqueue, key->fd, WRITEABLE_EVENT);
-            ioqueue_add_to_set(key->ioqueue, key->fd, EXCEPTION_EVENT);
+            ioqueue_add_to_set(key->ioqueue, key, WRITEABLE_EVENT);
+            ioqueue_add_to_set(key->ioqueue, key, EXCEPTION_EVENT);
             pj_mutex_unlock(key->mutex);
             return PJ_EPENDING;