1 files changed, 7 insertions, 4 deletions

diff --git a/opentracker.c b/opentracker.c
index e5efff5..644e99c 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -29,6 +29,7 @@
 #include "ot_ip.h"
 #include "ot_livesync.h"
 #include "ot_mutex.h"
+#include "ot_workqueue.h"
 #include "ot_random.h"
 #include "ot_scan.h"
 #include "ot_event.h"
@@ -37,6 +38,7 @@
 #include "ot_stats.h"
 #include "ot_tcp.h"
 #include "ot_udp.h"
+#include "ot_worker.h"
 #include "trackerlogic.h"
 
 /* Globals */
@@ -137,16 +139,18 @@ static void *server_mainloop(void *args) {
       else if ((intptr_t)cookie == FLAG_SELFPIPE)
         while (read((int)sock, ws.inbuf, G_INBUF_SIZE) > 0)
           ;
-      else {
+      else if (fdstate_claim((int)sock, ready[i].generation)) {
         if (ready[i].what & EVENT_IN)
           tcp_read(sock, &ws);
         /* The read may have closed it, so look again before writing */
         if ((ready[i].what & EVENT_OUT) && fdstate_generation((int)sock) == ready[i].generation)
           tcp_write(sock);
+        if (fdstate_generation((int)sock) == ready[i].generation)
+          fdstate_release((int)sock);
       }
     }
 
-    while ((sock = mutex_workqueue_popresult(&iovec_entries, &iovector, &is_partial)) != -1)
+    while ((sock = workqueue_popresult(&iovec_entries, &iovector, &is_partial)) != -1)
       http_sendiovecdata(sock, &ws, iovec_entries, iovector, is_partial);
 
     if (time_now_seconds() > next_timeout_check) {
@@ -426,8 +430,7 @@ int main(int argc, char **argv) {
   listen_start_udp_workers();
 
   server_mainloop(0);
-  tcp_workers_deinit();
-  udp_workers_deinit();
+  worker_stop_all();
 
   /* No thread is serving any more, so the teardown can run where a debugger
      and the sanitizers can follow it */