Plug in the new per-thread stats counter, also make sure that the ot_clean sleep does not stall tracker exit

1 files changed, 4 insertions, 1 deletions

diff --git a/ot_fullscrape.c b/ot_fullscrape.c
index 8518bd2..a86d6d7 100644
--- a/ot_fullscrape.c
+++ b/ot_fullscrape.c
@@ -55,6 +55,8 @@ static void *fullscrape_worker(void *args) {
   while (g_opentracker_running) {
     ot_tasktype tasktype = TASK_FULLSCRAPE;
     ot_taskid   taskid   = mutex_workqueue_poptask(&tasktype);
+    if (!taskid)
+      break;
 #ifdef WANT_COMPRESSION_ZSTD
     if (tasktype & TASK_FLAG_ZSTD)
       fullscrape_make_zstd(taskid, tasktype);
@@ -77,7 +79,8 @@ void fullscrape_init(void) {
 }
 
 void fullscrape_deinit(void) {
-  pthread_cancel( thread_id );
+  mutex_workqueue_wakeall();
+  pthread_join( thread_id, NULL );
 }
 
 void fullscrape_deliver( int64_t sock, ot_tasktype tasktype ) {