HevTaskIOReactorWSA: Init.

Author: heiher

.github/workflows/build.yaml

@@ -152,10 +152,9 @@ jobs:
             gcc
             git
             make
-            mingw-w64-clang-x86_64-libkqueue
       - name: Build
         shell: msys2 {0}
         run: |
           export MSYS=winsymlinks:native
           git clone --depth=1 --recursive file://`pwd` work; cd work
-          make CFLAGS="-I/clang64/include/kqueue" LFLAGS="-L/clang64/lib -lkqueue" -j`nproc`
+          make LFLAGS="-lmsys-2.0 -lws2_32" -j`nproc`

README.md

@@ -80,8 +80,7 @@ cd hev-task-system
 export MSYS=winsymlinks:native
 git clone https://gitlab.com/hev/hev-task-system
 cd hev-task-system
-# depends on mingw-w64-clang-x86_64-libkqueue
-make CFLAGS="-I/clang64/include/kqueue" LFLAGS="-L/clang64/lib -lkqueue"
+make LFLAGS="-lmsys-2.0 -lws2_32"
 ```
 
 ## Demos

src/kern/io/hev-task-io-reactor-kqueue.c

@@ -7,7 +7,7 @@
  ============================================================================
  */
 
-#if !defined(__linux__)
+#if !defined(__linux__) && !defined(__MSYS__)
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -55,20 +55,20 @@ hev_task_io_reactor_destroy (HevTaskIOReactor *self)
 }
 
 int
-hev_task_io_reactor_setup (HevTaskIOReactor *reactor,
+hev_task_io_reactor_setup (HevTaskIOReactor *self,
                            HevTaskIOReactorSetupEvent *events, int count)
 {
     int i, res = -1;
 
     for (i = 0; i < count; i++) {
         if (!(events[i].flags & EV_DELETE)) {
-            res = kevent (reactor->fd, &events[i], count - i, NULL, 0, NULL);
+            res = kevent (self->fd, &events[i], count - i, NULL, 0, NULL);
             break;
         }
-        res &= kevent (reactor->fd, &events[i], 1, NULL, 0, NULL);
+        res &= kevent (self->fd, &events[i], 1, NULL, 0, NULL);
     }
 
     return res;
 }
 
-#endif /* !defined(__linux__) */
+#endif /* !defined(__linux__) && !defined(__MSYS__) */

src/kern/io/hev-task-io-reactor-kqueue.h

@@ -15,14 +15,6 @@
 #include <sys/event.h>
 #include <sys/time.h>
 
-#if defined(__MSYS__)
-#include <io.h>
-#endif
-
-#ifndef get_osfhandle
-#define get_osfhandle
-#endif
-
 #ifndef EVFILT_EXCEPT
 #define EVFILT_EXCEPT (0)
 #endif
@@ -47,7 +39,7 @@ enum _HevTaskIOReactorOperation
 };
 
 static inline int
-hev_task_io_reactor_wait (HevTaskIOReactor *reactor,
+hev_task_io_reactor_wait (HevTaskIOReactor *self,
                           HevTaskIOReactorWaitEvent *events, int count,
                           int timeout)
 {
@@ -60,7 +52,7 @@ hev_task_io_reactor_wait (HevTaskIOReactor *reactor,
         tsp = &ts;
     }
 
-    return kevent (reactor->fd, NULL, 0, events, count, tsp);
+    return kevent (self->fd, NULL, 0, events, count, tsp);
 }
 
 static inline void
@@ -79,7 +71,7 @@ hev_task_io_reactor_setup_event_set (HevTaskIOReactorSetupEvent *event, int fd,
         action = EV_DELETE;
     }
 
-    EV_SET (event, get_osfhandle (fd), events, action | EV_CLEAR, 0, 0, data);
+    EV_SET (event, fd, events, action | EV_CLEAR, 0, 0, data);
 }
 
 static inline int