1 files changed, 38 insertions, 35 deletions

diff --git a/opentracker.c b/opentracker.c
index 11da486..a546fc5 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -39,20 +39,22 @@
 #include "trackerlogic.h"
 
 /* Globals */
-time_t              g_now_seconds;
 uint32_t            g_tracker_id;
-volatile int        g_opentracker_running = 1;
+_Atomic int         g_opentracker_running = 1;
 int                 g_self_pipe[2];
 
-
 static void         panic(const char *routine) __attribute__((noreturn));
 static void         panic(const char *routine) {
   fprintf(stderr, "%s: %s\n", routine, strerror(errno));
   exit(111);
 }
 
+/* Say we are stopping, wake the loop, and let main do the work on its own stack. */
 static void signal_handler(int s) {
   if (s == SIGINT) {
+    const char byte  = 0;
+    int        saved = errno;
+
     /* Any new interrupt signal quits the application */
     signal(SIGINT, SIG_DFL);
 
@@ -60,13 +62,8 @@ static void signal_handler(int s) {
        but cancel their operations and return */
     g_opentracker_running = 0;
 
-    trackerlogic_deinit();
-
-#ifdef WANT_SYSLOGS
-    closelog();
-#endif
-
-    exit(0);
+    (void)!write(g_self_pipe[1], &byte, 1);
+    errno = saved;
   }
 }
 
@@ -87,7 +84,7 @@ static void install_signal_handlers(void) {
 
   sa.sa_handler = signal_handler;
   sigemptyset(&sa.sa_mask);
-  sa.sa_flags = SA_RESTART;
+  sa.sa_flags = 0;
   if ((sigaction(SIGINT, &sa, NULL) == -1) || (sigaction(SIGALRM, &sa, NULL) == -1))
     panic("install_signal_handlers");
 
@@ -203,12 +200,12 @@ static void handle_write(const int64_t sock) {
        waiting to write and go back to waiting for the next request */
     http_interest_drop(sock, cookie, EVENT_OUT);
     http_interest_add(sock, cookie, EVENT_IN);
-    fdstate_set_expiry(sock, g_now_seconds + OT_CLIENT_TIMEOUT);
+    fdstate_set_expiry(sock, time_future_seconds(OT_CLIENT_TIMEOUT));
   } else
     handle_dead(sock);
 }
 
-static void handle_accept(const int64_t serversocket) {
+static void handle_accept(const int64_t serversocket, struct ot_workstruct *ws) {
   struct http_data *cookie;
   int64_t           sock;
   ot_ip6            ip;
@@ -218,22 +215,21 @@ static void handle_accept(const int64_t serversocket) {
 
     socket_set_blocking((int)sock, 0);
 
-    if (!(cookie = (struct http_data *)malloc(sizeof(struct http_data)))) {
+    if (!(cookie = (struct http_data *)calloc(1, sizeof(struct http_data)))) {
       close((int)sock);
       continue;
     }
-    memset(cookie, 0, sizeof(struct http_data));
     memcpy(cookie->ip, ip, sizeof(ot_ip6));
     cookie->interest = EVENT_IN;
 
-    if (event_add((int)sock, EVENT_IN, fdstate_open(sock, cookie, g_now_seconds + OT_CLIENT_TIMEOUT)) == -1) {
+    if (event_add((int)sock, EVENT_IN, fdstate_open(sock, cookie, time_future_seconds(OT_CLIENT_TIMEOUT))) == -1) {
       fdstate_close(sock);
       free(cookie);
       close((int)sock);
       continue;
     }
 
-    stats_issue_event(EVENT_ACCEPT, FLAG_TCP, (uintptr_t)ip);
+    stats_issue_event(ws, EVENT_ACCEPT, FLAG_TCP, (uintptr_t)ip);
   }
 }
 
@@ -242,7 +238,7 @@ static void handle_accept(const int64_t serversocket) {
 
 static void *server_mainloop(void *args) {
   struct ot_workstruct ws;
-  time_t               next_timeout_check = g_now_seconds + OT_CLIENT_TIMEOUT_CHECKINTERVAL;
+  time_t               next_timeout_check = time_future_seconds(OT_CLIENT_TIMEOUT_CHECKINTERVAL);
   struct iovec        *iovector;
   size_t               iovec_entries;
   int                  is_partial;
@@ -250,6 +246,8 @@ static void *server_mainloop(void *args) {
   (void)args;
 
   /* Initialize our "thread local storage" */
+  memset(&ws, 0, sizeof(ws));
+  stats_counters_register(&ws);
   ws.inbuf  = malloc(G_INBUF_SIZE);
   ws.outbuf = malloc(G_OUTBUF_SIZE);
 #ifdef _DEBUG_HTTPERROR
@@ -261,7 +259,7 @@ static void *server_mainloop(void *args) {
 
   random_bytes(ws.rand48_state, sizeof(ws.rand48_state));
 
-  for (;;) {
+  while (g_opentracker_running) {
     ot_event ready[OT_EVENT_BATCH];
     int64_t  sock;
     int      count, i;
@@ -280,7 +278,7 @@ static void *server_mainloop(void *args) {
       cookie = fdstate_cookie((int)sock);
 
       if ((intptr_t)cookie == FLAG_TCP)
-        handle_accept(sock);
+        handle_accept(sock, &ws);
       else if ((intptr_t)cookie == FLAG_UDP)
         handle_udp6(sock, &ws);
       else if ((intptr_t)cookie == FLAG_SELFPIPE)
@@ -298,16 +296,26 @@ static void *server_mainloop(void *args) {
     while ((sock = mutex_workqueue_popresult(&iovec_entries, &iovector, &is_partial)) != -1)
       http_sendiovecdata(sock, &ws, iovec_entries, iovector, is_partial);
 
-    if (g_now_seconds > next_timeout_check) {
+    if (time_now_seconds() > next_timeout_check) {
       int cursor = 0;
 
-      while ((sock = fdstate_next_expired(g_now_seconds, &cursor)) != -1)
+      while ((sock = fdstate_next_expired(time_now_seconds(), &cursor)) != -1)
         handle_dead(sock);
-      next_timeout_check = g_now_seconds + OT_CLIENT_TIMEOUT_CHECKINTERVAL;
+      next_timeout_check = time_future_seconds(OT_CLIENT_TIMEOUT_CHECKINTERVAL);
     }
 
     livesync_ticker();
   }
+
+  /* This work struct is about to go out of scope, so hand its tally over
+     before anything can read it there */
+  stats_counters_retire(&ws);
+
+  free(ws.inbuf);
+  free(ws.outbuf);
+#ifdef _DEBUG_HTTPERROR
+  free(ws.debugbuf);
+#endif
   return 0;
 }
 
@@ -461,17 +469,7 @@ int drop_privileges(const char *const serveruser, const char *const serverdir) {
 }
 
 /* Maintain our copy of the clock. time() on BSDs is very expensive. */
-static void *time_caching_worker(void *args) {
-  (void)args;
-  while (1) {
-    g_now_seconds = time(NULL);
-    sleep(5);
-  }
-  return NULL;
-}
-
 int main(int argc, char **argv) {
-  pthread_t thread_id; /* time cacher */
 
   random_init();
   if (fdstate_init() == -1)
@@ -492,8 +490,6 @@ int main(int argc, char **argv) {
   if (drop_privileges(g_serveruser ? g_serveruser : "nobody", g_serverdir) == -1)
     panic("drop_privileges failed, exiting. Last error");
 
-  g_now_seconds = time(NULL);
-  pthread_create(&thread_id, NULL, time_caching_worker, NULL);
 
   /* Create our self pipe which allows us to interrupt mainloops
      wait in case some data is available to send out */
@@ -524,6 +520,13 @@ int main(int argc, char **argv) {
 
   server_mainloop(0);
 
+  /* The loop has left, so no thread is serving any more and the teardown
+     can run where a debugger and the sanitizers can follow it */
+  trackerlogic_deinit();
+#ifdef WANT_SYSLOGS
+  closelog();
+#endif
+
   event_deinit();
   fdstate_deinit();
   return 0;