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

Timestamp:

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

Author:

bennylp

Message:

Attempted to fix epoll for Linux

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_select.c (modified) (4 diffs)

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

@@ -543 +543 @@
  */
 static void ioqueue_remove_from_set( pj_ioqueue_t *ioqueue,
-                                     pj_sock_t fd, 
+                                     pj_ioqueue_key_t *key, 
                                      enum ioqueue_event_type event_type)
 {
@@ -549 +549 @@
 
     if (event_type == READABLE_EVENT)
-        PJ_FD_CLR((pj_sock_t)fd, &ioqueue->rfdset);
+        PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->rfdset);
     else if (event_type == WRITEABLE_EVENT)
-        PJ_FD_CLR((pj_sock_t)fd, &ioqueue->wfdset);
+        PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->wfdset);
     else if (event_type == EXCEPTION_EVENT)
-        PJ_FD_CLR((pj_sock_t)fd, &ioqueue->xfdset);
+        PJ_FD_CLR((pj_sock_t)key->fd, &ioqueue->xfdset);
     else
         pj_assert(0);
@@ -567 +567 @@
  */
 static void ioqueue_add_to_set( pj_ioqueue_t *ioqueue,
-                                pj_sock_t fd,
+                                pj_ioqueue_key_t *key,
                                 enum ioqueue_event_type event_type )
 {
@@ -573 +573 @@
 
     if (event_type == READABLE_EVENT)
-        PJ_FD_SET((pj_sock_t)fd, &ioqueue->rfdset);
+        PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->rfdset);
     else if (event_type == WRITEABLE_EVENT)
-        PJ_FD_SET((pj_sock_t)fd, &ioqueue->wfdset);
+        PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->wfdset);
     else if (event_type == EXCEPTION_EVENT)
-        PJ_FD_SET((pj_sock_t)fd, &ioqueue->xfdset);
+        PJ_FD_SET((pj_sock_t)key->fd, &ioqueue->xfdset);
     else
         pj_assert(0);