Changeset 51858943917d1d17f853848975f6f209a7073def

Timestamp:

07/17/11 03:04:34 (10 months ago)

Author:

D J Capelis <dev@…>

Parents:

434f758431a198683e1276f61d2c5f8edd7cdc01

git-committer:

D J Capelis <dev@capelis.dj> / 2011-07-17T03:04:34Z-0700

Message:

Fix broken epoll->kqueue compat shim, make error handling more useful

Files:

• compat/epoll.c (modified) (4 diffs)

compat/epoll.c

@@ -51 +51 @@
 
 err:
+    perror("In epoll_create() compat code");
     return -1;
 }
@@ -62 +63 @@
     // Set up kevent structure
     struct kevent64_s kev;
-    struct timespec ts;
     switch(op)
     {
         case EV_DELETE:
-        //case EPOLL_CTL_MOD:
+            error_chk(event == NULL)
             EV_SET64(&kev, fd, EPOLLIN, op, 0, 0, 0, 0, 0);
-            error_chk(kevent64(kq, &kev, 1, NULL, 0, 0, &ts) == -1);
+            error_chk(kevent64(kq, &kev, 1, NULL, 0, 0, NULL) == -1);
             EV_SET64(&kev, fd, EPOLLOUT, op, 0, 0, 0, 0, 0);
-            error_chk(kevent64(kq, &kev, 1, NULL, 0, 0, &ts) == -1);
-            if(op == EPOLL_CTL_DEL)
-                break;
+            error_chk(kevent64(kq, &kev, 1, NULL, 0, 0, NULL) == -1);
+            break;
         case EV_ADD:
             error_chk(event == NULL)
             EV_SET64(&kev, fd, event->events, op, 0, 0, 0, 0, 0);
-            error_chk(kevent64(kq, &kev, 1, NULL, 0, 0, &ts) == -1);
+            error_chk(kevent64(kq, &kev, 1, NULL, 0, 0, NULL) == -1);
+            break;
     }
 
@@ -82 +82 @@
 
 err:
+    perror("In epoll_ctl() compat code");
     return -1;
 }
@@ -124 +125 @@
 
 err:
+    perror("In epoll_wait() compat code");
     return -1;
 }