1 files changed, 34 insertions, 5 deletions

diff --git a/ot_clean.c b/ot_clean.c
index bf0504c..77ea239 100644
--- a/ot_clean.c
+++ b/ot_clean.c
@@ -4,6 +4,7 @@
    $id$ */
 
 /* System */
+#include <errno.h>
 #include <pthread.h>
 #include <string.h>
 #include <unistd.h>
@@ -46,7 +47,7 @@ static ssize_t clean_single_bucket(ot_peer *peers, size_t peer_count, size_t pee
 
 int clean_single_peer_list(ot_peerlist *peer_list, size_t peer_size) {
   ot_vector *peer_vector = &peer_list->peers;
-  time_t     timedout    = (time_t)(g_now_minutes - peer_list->base);
+  time_t     timedout    = (time_t)(time_now_minutes() - peer_list->base);
   size_t     num_buckets = 1, removed_seeders = 0;
 
   /* No need to clean empty torrent */
@@ -87,11 +88,11 @@ int clean_single_peer_list(ot_peerlist *peer_list, size_t peer_size) {
     vector_redistribute_buckets(peer_list, peer_size);
 
   if (peer_list->peer_count)
-    peer_list->base = g_now_minutes;
+    peer_list->base = time_now_minutes();
   else {
     /* When we got here, the last time that torrent
      has been touched is OT_PEER_TIMEOUT Minutes before */
-    peer_list->base = g_now_minutes - OT_PEER_TIMEOUT;
+    peer_list->base = time_now_minutes() - OT_PEER_TIMEOUT;
   }
   return 0;
 }
@@ -103,6 +104,29 @@ int clean_single_torrent(ot_torrent *torrent) {
   return clean_single_peer_list(torrent->peer_list6, OT_PEER_SIZE6) * clean_single_peer_list(torrent->peer_list4, OT_PEER_SIZE4);
 }
 
+static pthread_mutex_t g_clean_mutex  = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t  g_clean_wakeup = PTHREAD_COND_INITIALIZER;
+
+static void clean_sleep(void) {
+  struct timespec deadline;
+
+  clock_gettime(CLOCK_REALTIME, &deadline);
+  deadline.tv_sec  += OT_CLEAN_SLEEP / 1000000;
+  deadline.tv_nsec += (OT_CLEAN_SLEEP % 1000000) * 1000;
+  if (deadline.tv_nsec >= 1000000000) {
+    ++deadline.tv_sec;
+    deadline.tv_nsec -= 1000000000;
+  }
+
+  /* Both sides hold the mutex, so the flag cannot be cleared and signalled
+     in the window between testing it and waiting on it */
+  pthread_mutex_lock(&g_clean_mutex);
+  while (g_opentracker_running)
+    if (pthread_cond_timedwait(&g_clean_wakeup, &g_clean_mutex, &deadline) == ETIMEDOUT)
+      break;
+  pthread_mutex_unlock(&g_clean_mutex);
+}
+
 /* Clean up all peers in current bucket, remove timedout pools and
  torrents */
 static void *clean_worker(void *args) {
@@ -125,7 +149,7 @@ static void *clean_worker(void *args) {
       mutex_bucket_unlock(bucket, delta_torrentcount);
       if (!g_opentracker_running)
         return NULL;
-      usleep(OT_CLEAN_SLEEP);
+      clean_sleep();
     }
     stats_cleanup();
 #ifdef WANT_ACCESSLIST
@@ -138,4 +162,9 @@ static void *clean_worker(void *args) {
 static pthread_t thread_id;
 void clean_init(void) { pthread_create(&thread_id, NULL, clean_worker, NULL); }
 
-void clean_deinit(void) { pthread_cancel(thread_id); }
+void clean_deinit(void) {
+  pthread_mutex_lock(&g_clean_mutex);
+  pthread_cond_signal(&g_clean_wakeup);
+  pthread_mutex_unlock(&g_clean_mutex);
+  pthread_join(thread_id, NULL);
+}