Replace libowfat's event waiter with our own abstraction

It's with a heavy heart that I remove libowfat as my event library from
opentracker.

libowfat is what taught opentracker to walk and then fly. The tracker was
literally standing on the shoulder of giants when I started writing it in
2006. For its time, the event abstraction was unparalleled and it has
held up for many years, and it served the bittorrent community greatly.

https://erdgeist.org/gitweb/opentracker/commit/?id=ad472597c569568bad0526d116b601dfcb36638c

Unfortunately, it is very likely that libowfat will not be maintained
anymore for the foreseeable future, it is already not easy to get its
source from upstream and opentracker started receiving bug reports that I
can not reasonably answer or patch.

Before the project gets more dependent on the limitations of libowfat's
current state, I need to teach opentracker to stand on its own feet and
fly by itself. I've learned a great deal in the process and have even
more respect now for what libowfat pioneered.

The path for opentracker is cleared now. Ground work has already been
laid in the migration process to support multi threaded http processing
while keeping the aggressive reduction of syscalls alive that made the
libowfat+opentracker combo so scalable.

Here be some dragons, though: Even though there is a unit test suite
now, the event loop's rewrite has not been battle tested yet. So you
might want to hold up for a bit before jumping on the solo band wagon.

What awaits at the end will be a long overdue v1.0, which will be named
in honour of Felix.

1 files changed, 10 insertions, 10 deletions

diff --git a/ot_event.c b/ot_event.c
index d24227d..ce0feef 100644
--- a/ot_event.c
+++ b/ot_event.c
@@ -60,7 +60,7 @@ static int event_ctl(int op, int fd, int what, uint32_t generation) {
   struct epoll_event ev;
 
   memset(&ev, 0, sizeof(ev));
-  ev.events = (what & EVENT_READ ? (uint32_t)EPOLLIN : 0) | (what & EVENT_WRITE ? (uint32_t)EPOLLOUT : 0);
+  ev.events = (what & EVENT_IN ? (uint32_t)EPOLLIN : 0) | (what & EVENT_OUT ? (uint32_t)EPOLLOUT : 0);
   /* The generation rides along inside the kernel, so an event says which
      connection it belongs to without anybody looking it up */
   ev.data.u64 = ((uint64_t)generation << 32) | (uint32_t)fd;
@@ -92,8 +92,8 @@ int event_wait(ot_event *out, int max, int timeout_ms) {
     out[i].generation = (uint32_t)(g_ready[i].data.u64 >> 32);
     /* A hangup or an error is reported as both, so whichever side the caller
        was waiting on gets to notice */
-    out[i].what = (events & (EPOLLIN | EPOLLHUP | EPOLLERR) ? EVENT_READ : 0) |
-                  (events & (EPOLLOUT | EPOLLHUP | EPOLLERR) ? EVENT_WRITE : 0);
+    out[i].what = (events & (EPOLLIN | EPOLLHUP | EPOLLERR) ? EVENT_IN : 0) |
+                  (events & (EPOLLOUT | EPOLLHUP | EPOLLERR) ? EVENT_OUT : 0);
   }
   return count;
 }
@@ -138,9 +138,9 @@ static int event_change(int fd, int what, uint32_t generation, int deleting) {
   int           succeeded = 0, count, i;
 
   EV_SET(&change[0], (uintptr_t)fd, EVFILT_READ,
-         EV_RECEIPT | ((deleting || !(what & EVENT_READ)) ? EV_DELETE : EV_ADD), 0, 0, udata);
+         EV_RECEIPT | ((deleting || !(what & EVENT_IN)) ? EV_DELETE : EV_ADD), 0, 0, udata);
   EV_SET(&change[1], (uintptr_t)fd, EVFILT_WRITE,
-         EV_RECEIPT | ((deleting || !(what & EVENT_WRITE)) ? EV_DELETE : EV_ADD), 0, 0, udata);
+         EV_RECEIPT | ((deleting || !(what & EVENT_OUT)) ? EV_DELETE : EV_ADD), 0, 0, udata);
 
   if ((count = kevent(g_kqueue, change, 2, result, 2, NULL)) == -1)
     return -1;
@@ -197,8 +197,8 @@ int event_wait(ot_event *out, int max, int timeout_ms) {
 
     out[i].fd         = (int)(uint32_t)udata;
     out[i].generation = (uint32_t)(udata >> 32);
-    out[i].what       = ((g_ready[i].filter == EVFILT_READ || eof) ? EVENT_READ : 0) |
-                  ((g_ready[i].filter == EVFILT_WRITE || eof) ? EVENT_WRITE : 0);
+    out[i].what       = ((g_ready[i].filter == EVFILT_READ || eof) ? EVENT_IN : 0) |
+                  ((g_ready[i].filter == EVFILT_WRITE || eof) ? EVENT_OUT : 0);
   }
   return count;
 }
@@ -232,7 +232,7 @@ void event_deinit(void) {
 }
 
 static short event_to_poll(int what) {
-  return (short)((what & EVENT_READ ? POLLIN : 0) | (what & EVENT_WRITE ? POLLOUT : 0));
+  return (short)((what & EVENT_IN ? POLLIN : 0) | (what & EVENT_OUT ? POLLOUT : 0));
 }
 
 static int event_room_for(int fd) {
@@ -322,8 +322,8 @@ int event_wait(ot_event *out, int max, int timeout_ms) {
       continue;
     out[found].fd         = g_pfds[i].fd;
     out[found].generation = g_generation[i];
-    out[found].what       = (revents & (POLLIN | POLLHUP | POLLERR | POLLNVAL) ? EVENT_READ : 0) |
-                      (revents & (POLLOUT | POLLHUP | POLLERR | POLLNVAL) ? EVENT_WRITE : 0);
+    out[found].what       = (revents & (POLLIN | POLLHUP | POLLERR | POLLNVAL) ? EVENT_IN : 0) |
+                      (revents & (POLLOUT | POLLHUP | POLLERR | POLLNVAL) ? EVENT_OUT : 0);
     ++found;
   }
   return found;