Get xdispatch working on Linux (#6)

Author: yvt

NGSEngine/src/xdispatch/build.rs

@@ -24,9 +24,7 @@ fn main() {
             build
                 .file("lib/libpthread_workqueue/posix/manager.c")
                 .file("lib/libpthread_workqueue/posix/thread_info.c")
-                .file("lib/libpthread_workqueue/posix/thread_rt.c")
-                .file("lib/libpthread_workqueue/api.c")
-                .file("lib/libpthread_workqueue/witem_cache.c");
+                .file("lib/libpthread_workqueue/posix/thread_rt.c");
         }
         build
             .file("lib/libpthread_workqueue/api.c")
@@ -45,7 +43,6 @@ fn main() {
         } else {
             build
                 .file("lib/libkqueue/linux/platform.c")
-                .file("lib/libkqueue/linux/proc.c")
                 .file("lib/libkqueue/linux/read.c")
                 .file("lib/libkqueue/linux/signal.c")
                 .file("lib/libkqueue/linux/timer.c")
@@ -60,13 +57,16 @@ fn main() {
             .file("lib/libkqueue/common/kqueue.c")
             .file("lib/libkqueue/common/map.c")
             .include("lib/include")
+            .include("lib/libkqueue/common")
             .compile("libkqueue.a");
 
         let mut build = cc::Build::new();
         if target_parts[2] == "windows" {
             build
                 .file("lib/xdispatch/platform/windows/platform.c")
                 .include("lib/xdispatch/platform/windows");
+        } else {
+            build.include("lib/xdispatch/platform/posix");
         }
         build
             .file("lib/xdispatch/src/apply.c")

NGSEngine/src/xdispatch/lib/include/kqueue/sys/event.h

@@ -203,7 +203,7 @@ int     kevent(int kq, const struct kevent *changelist, int nchanges,
 	    struct kevent *eventlist, int nevents,
 	    const struct timespec *timeout);
 #ifdef MAKE_STATIC
-void     libkqueue_init();
+int     libkqueue_init();
 #endif
 #endif
 

NGSEngine/src/xdispatch/lib/libkqueue/linux/platform.c

@@ -14,6 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+# define _GNU_SOURCE
+# include <poll.h>
 #include "../common/private.h"
 
 //XXX-FIXME TEMP
@@ -90,25 +92,37 @@ linux_kevent_wait_hires(
         struct kqueue *kq, 
         const struct timespec *timeout)
 {
-    fd_set fds;
     int n;
+#if HAVE_DECL_PPOLL
+    struct pollfd fds;
+
+    dbg_printf("waiting for events (timeout=%ld sec %ld nsec)",
+            timeout->tv_sec, timeout->tv_nsec);
+    fds.fd = kqueue_epfd(kq);
+    fds.events = POLLIN;
+
+    n = ppoll(&fds, 1, timeout, NULL);
+#else
     int epfd;
+    fd_set fds;
 
     dbg_printf("waiting for events (timeout=%ld sec %ld nsec)",
             timeout->tv_sec, timeout->tv_nsec);
+
     epfd = kqueue_epfd(kq);
     FD_ZERO(&fds);
     FD_SET(epfd, &fds);
     n = pselect(epfd + 1, &fds, NULL , NULL, timeout, NULL);
+#endif
+
     if (n < 0) {
         if (errno == EINTR) {
             dbg_puts("signal caught");
             return (-1);
         }
-        dbg_perror("pselect(2)");
+        dbg_perror("ppoll(2) or pselect(2)");
         return (-1);
     }
-
     return (n);
 }
 
@@ -120,25 +134,27 @@ linux_kevent_wait(
 {
     int timeout, nret;
 
-    /* Use pselect() if the timeout value is less than one millisecond.  */
-    if (ts != NULL && ts->tv_sec == 0 && ts->tv_nsec < 1000000) {
+    /* Use a high-resolution syscall if the timeout value is less than one millisecond.  */
+    if (ts != NULL && ts->tv_sec == 0 && ts->tv_nsec > 0 && ts->tv_nsec < 1000000) {
         nret = linux_kevent_wait_hires(kq, ts);
+        if (nret <= 0)
+            return (nret);
 
-    /* Otherwise, use epoll_wait() directly */
+        /* epoll_wait() should have ready events */
+        timeout = 0;
     } else {
-
         /* Convert timeout to the format used by epoll_wait() */
         if (ts == NULL) 
             timeout = -1;
         else
             timeout = (1000 * ts->tv_sec) + (ts->tv_nsec / 1000000);
+    }
 
-        dbg_puts("waiting for events");
-        nret = epoll_wait(kqueue_epfd(kq), &epevt[0], nevents, timeout);
-        if (nret < 0) {
-            dbg_perror("epoll_wait");
-            return (-1);
-        }
+    dbg_puts("waiting for events");
+    nret = epoll_wait(kqueue_epfd(kq), &epevt[0], nevents, timeout);
+    if (nret < 0) {
+        dbg_perror("epoll_wait");
+        return (-1);
     }
 
     return (nret);
@@ -157,7 +173,6 @@ linux_kevent_copyout(struct kqueue *kq, int nready,
     for (i = 0; i < nready; i++) {
         ev = &epevt[i];
         kn = (struct knote *) ev->data.ptr;
-        knote_lock(kn);
         filt = &kq->kq_filt[~(kn->kev.filter)];
         rv = filt->kf_copyout(eventlist, kn, ev);
         if (slowpath(rv < 0)) {
@@ -174,8 +189,6 @@ linux_kevent_copyout(struct kqueue *kq, int nready,
             knote_disable(filt, kn); //FIXME: Error checking
         if (eventlist->flags & EV_ONESHOT) {
             knote_delete(filt, kn); //FIXME: Error checking
-        } else {
-            knote_unlock(kn);
         }
 
         /* If an empty kevent structure is returned, the event is discarded. */
@@ -196,7 +209,8 @@ linux_eventfd_init(struct eventfd *e)
 {
     int evfd;
 
-    if ((evfd = eventfd(0, 0)) < 0) {
+    evfd = eventfd(0, 0);
+    if (evfd < 0) {
         dbg_perror("eventfd");
         return (-1);
     }
@@ -295,8 +309,7 @@ linux_get_descriptor_type(struct knote *kn)
         dbg_perror("fstat(2)");
         return (-1);
     }
-    if (! S_ISSOCK(sb.st_mode)) {
-        //FIXME: could be a pipe, device file, or other non-regular file
+    if (S_ISREG(sb.st_mode)) {
         kn->kn_flags |= KNFL_REGULAR_FILE;
         dbg_printf("fd %d is a regular file\n", (int)kn->kev.ident);
         return (0);
@@ -305,6 +318,9 @@ linux_get_descriptor_type(struct knote *kn)
     /*
      * Test if the socket is active or passive.
      */
+    if (! S_ISSOCK(sb.st_mode))
+        return (0);
+
     slen = sizeof(lsock);
     lsock = 0;
     i = getsockopt(kn->kev.ident, SOL_SOCKET, SO_ACCEPTCONN, (char *) &lsock, &slen);

NGSEngine/src/xdispatch/lib/libkqueue/linux/platform.h

@@ -19,21 +19,35 @@
 
 struct filter;
 
+#include <sys/syscall.h>
 #include <sys/epoll.h>
 #include <sys/queue.h>
 #include <sys/inotify.h>
-#include <sys/eventfd.h>
-#include <sys/signalfd.h>
-#include <sys/timerfd.h>
+#if HAVE_SYS_EVENTFD_H
+# include <sys/eventfd.h>
+#else
+# define eventfd(a,b) syscall(SYS_eventfd, (a), (b))
+
+  static inline int eventfd_write(int fd, uint64_t val) {
+      if (write(fd, &val, sizeof(val)) < (ssize_t) sizeof(val))
+          return (-1);
+      else
+          return (0);
+  }
+#endif
+#if HAVE_SYS_TIMERFD_H
+# include <sys/timerfd.h>
+#endif
 
 /*
  * Get the current thread ID
  */
 # define _GNU_SOURCE
 # include <linux/unistd.h>
-# include <sys/syscall.h>
 # include <unistd.h>
+#ifndef __ANDROID__
 extern long int syscall (long int __sysno, ...);
+#endif
 
 /* Convenience macros to access the epoll descriptor for the kqueue */
 #define kqueue_epfd(kq)     ((kq)->kq_id)