1 files changed, 19 insertions, 9 deletions

diff --git a/src/ot_fullscrape.c b/src/ot_fullscrape.c
index 85be65d..0cd1910 100644
--- a/src/ot_fullscrape.c
+++ b/src/ot_fullscrape.c
@@ -72,7 +72,8 @@ static void *fullscrape_worker(void *args) {
 
 static pthread_t thread_id;
 void fullscrape_init(void) {
-  pthread_create( &thread_id, NULL, fullscrape_worker, NULL );
+  if (pthread_create(&thread_id, NULL, fullscrape_worker, NULL))
+    exerr("Cannot create fullscrape worker thread.");
 }
 
 void fullscrape_deinit(void) {
@@ -90,9 +91,9 @@ static void fullscrape_write_one( ot_tasktype mode, char **cursor, ot_torrent *t
      exactly that size */
   char       *r          = *cursor;
   const char *r_end      = r + OT_SCRAPE_MAXENTRYLEN;
-  size_t      seed_count = torrent->peer_list6->seed_count + torrent->peer_list4->seed_count;
-  size_t      peer_count = torrent->peer_list6->peer_count + torrent->peer_list4->peer_count;
-  size_t      down_count = torrent->peer_list6->down_count + torrent->peer_list4->down_count;
+  size_t      seed_count = torrent_seed_count(torrent);
+  size_t      peer_count = torrent_peer_count(torrent);
+  size_t      down_count = torrent->down_count;
 
   switch (mode & TASK_TASK_MASK) {
   case TASK_FULLSCRAPE:
@@ -131,7 +132,7 @@ static void fullscrape_write_one( ot_tasktype mode, char **cursor, ot_torrent *t
   case TASK_FULLSCRAPE_TRACKERSTATE:
     hex_from_hash(r, *hash);
     r += 2 * sizeof(ot_hash);
-    fmt_append(&r, r_end, ":%zd:%zd\n", (ssize_t)time_since_minutes(torrent->peer_list6->base), down_count);
+    fmt_append(&r, r_end, ":%zd:%zd\n", (ssize_t)(time_wall_minutes() - time_since_minutes(torrent->base)), down_count);
     break;
   }
   *cursor = r;
@@ -188,8 +189,10 @@ static void fullscrape_make(int taskid, ot_tasktype mode) {
     mutex_bucket_unlock(bucket, 0);
 
     /* Parent thread died? */
-    if (!g_opentracker_running)
+    if (!g_opentracker_running) {
+      free(iovector.iov_base);
       return;
+    }
   }
 
   if ((mode & TASK_TASK_MASK) == TASK_FULLSCRAPE)
@@ -217,8 +220,10 @@ static void fullscrape_make_gzip(int taskid, ot_tasktype mode) {
   memset(&strm, 0, sizeof(strm));
   strm.next_out  = (uint8_t *)iovector.iov_base;
   strm.avail_out = OT_SCRAPE_CHUNK_SIZE;
-  if (deflateInit2(&strm, 7, Z_DEFLATED, 31, 9, Z_DEFAULT_STRATEGY) != Z_OK)
-    fprintf(stderr, "not ok.\n");
+  if (deflateInit2(&strm, 7, Z_DEFLATED, 31, 9, Z_DEFAULT_STRATEGY) != Z_OK) {
+    free(iovector.iov_base);
+    return;
+  }
 
   if ((mode & TASK_TASK_MASK) == TASK_FULLSCRAPE) {
     strm.next_in  = (uint8_t *)"d5:filesd";
@@ -250,6 +255,7 @@ static void fullscrape_make_gzip(int taskid, ot_tasktype mode) {
 
         if (workqueue_pushchunked(taskid, &iovector)) {
           free(iovector.iov_base);
+          deflateEnd(&strm);
           mutex_bucket_unlock(bucket, 0);
           return;
         }
@@ -274,6 +280,7 @@ static void fullscrape_make_gzip(int taskid, ot_tasktype mode) {
 
     /* Parent thread died? */
     if (!g_opentracker_running) {
+      free(iovector.iov_base);
       deflateEnd(&strm);
       return;
     }
@@ -402,8 +409,11 @@ static void fullscrape_make_zstd(int taskid, ot_tasktype mode) {
     mutex_bucket_unlock(bucket, 0);
 
     /* Parent thread died? */
-    if (!g_opentracker_running)
+    if (!g_opentracker_running) {
+      free(iovector.iov_base);
+      ZSTD_freeCCtx(zstream);
       return;
+    }
   }
 
   if ((mode & TASK_TASK_MASK) == TASK_FULLSCRAPE) {