1 files changed, 59 insertions, 54 deletions

diff --git a/ot_mutex.h b/ot_mutex.h
index bd07009..cdfabc9 100644
--- a/ot_mutex.h
+++ b/ot_mutex.h
@@ -7,69 +7,74 @@
 #define OT_MUTEX_H__
 
 #include <sys/uio.h>
+#include "trackerlogic.h"
 
-void mutex_init( );
-void mutex_deinit( );
+void       mutex_init(void);
+void       mutex_deinit(void);
 
-ot_vector *mutex_bucket_lock( int bucket );
-ot_vector *mutex_bucket_lock_by_hash( ot_hash hash );
+ot_vector *mutex_bucket_lock(int bucket);
+ot_vector *mutex_bucket_lock_by_hash(ot_hash const hash);
 
-void mutex_bucket_unlock( int bucket, int delta_torrentcount );
-void mutex_bucket_unlock_by_hash( ot_hash hash, int delta_torrentcount );
+void       mutex_bucket_unlock(int bucket, int delta_torrentcount);
+void       mutex_bucket_unlock_by_hash(ot_hash const hash, int delta_torrentcount);
 
-size_t mutex_get_torrent_count();
+size_t     mutex_get_torrent_count(void);
 
 typedef enum {
-  TASK_STATS_CONNS                 = 0x0001,
-  TASK_STATS_TCP                   = 0x0002,
-  TASK_STATS_UDP                   = 0x0003,
-  TASK_STATS_SCRAPE                = 0x0004,
-  TASK_STATS_FULLSCRAPE            = 0x0005,
-  TASK_STATS_TPB                   = 0x0006,
-  TASK_STATS_HTTPERRORS            = 0x0007,
-  TASK_STATS_VERSION               = 0x0008,
-  TASK_STATS_BUSY_NETWORKS         = 0x0009,
-  TASK_STATS_RENEW                 = 0x000a,
-  TASK_STATS_SYNCS                 = 0x000b,
-  TASK_STATS_COMPLETED             = 0x000c,
-  TASK_STATS_NUMWANTS              = 0x000d,
-
-  TASK_STATS                       = 0x0100, /* Mask */
-  TASK_STATS_TORRENTS              = 0x0101,
-  TASK_STATS_PEERS                 = 0x0102,
-  TASK_STATS_SLASH24S              = 0x0103,
-  TASK_STATS_TOP10                 = 0x0104,
-  TASK_STATS_TOP100                = 0x0105,
-  TASK_STATS_EVERYTHING            = 0x0106,
-  TASK_STATS_FULLLOG               = 0x0107,
-  TASK_STATS_WOODPECKERS           = 0x0108,
-  
-  TASK_FULLSCRAPE                  = 0x0200, /* Default mode */
-  TASK_FULLSCRAPE_TPB_BINARY       = 0x0201,
-  TASK_FULLSCRAPE_TPB_ASCII        = 0x0202,
-  TASK_FULLSCRAPE_TPB_ASCII_PLUS   = 0x0203,
-  TASK_FULLSCRAPE_TPB_URLENCODED   = 0x0204,
-  TASK_FULLSCRAPE_TRACKERSTATE     = 0x0205,
-
-  TASK_DMEM                        = 0x0300,
-
-  TASK_DONE                        = 0x0f00,
-
-  TASK_FLAG_GZIP                   = 0x1000,
-  TASK_FLAG_BZIP2                  = 0x2000,
-
-  TASK_TASK_MASK                   = 0x0fff,
-  TASK_CLASS_MASK                  = 0x0f00,
-  TASK_FLAGS_MASK                  = 0xf000
+  TASK_STATS_CONNS               = 0x0001,
+  TASK_STATS_TCP                 = 0x0002,
+  TASK_STATS_UDP                 = 0x0003,
+  TASK_STATS_SCRAPE              = 0x0004,
+  TASK_STATS_FULLSCRAPE          = 0x0005,
+  TASK_STATS_TPB                 = 0x0006,
+  TASK_STATS_HTTPERRORS          = 0x0007,
+  TASK_STATS_VERSION             = 0x0008,
+  TASK_STATS_BUSY_NETWORKS       = 0x0009,
+  TASK_STATS_RENEW               = 0x000a,
+  TASK_STATS_SYNCS               = 0x000b,
+  TASK_STATS_COMPLETED           = 0x000c,
+  TASK_STATS_NUMWANTS            = 0x000d,
+
+  TASK_STATS                     = 0x0100, /* Mask */
+  TASK_STATS_TORRENTS            = 0x0101,
+  TASK_STATS_PEERS               = 0x0102,
+  TASK_STATS_SLASH24S            = 0x0103,
+  TASK_STATS_TOP10               = 0x0104,
+  TASK_STATS_TOP100              = 0x0105,
+  TASK_STATS_EVERYTHING          = 0x0106,
+  TASK_STATS_FULLLOG             = 0x0107,
+  TASK_STATS_WOODPECKERS         = 0x0108,
+
+  TASK_FULLSCRAPE                = 0x0200, /* Default mode */
+  TASK_FULLSCRAPE_TPB_BINARY     = 0x0201,
+  TASK_FULLSCRAPE_TPB_ASCII      = 0x0202,
+  TASK_FULLSCRAPE_TPB_ASCII_PLUS = 0x0203,
+  TASK_FULLSCRAPE_TPB_URLENCODED = 0x0204,
+  TASK_FULLSCRAPE_TRACKERSTATE   = 0x0205,
+
+  TASK_DMEM                      = 0x0300,
+
+  TASK_DONE                      = 0x0f00,
+  TASK_DONE_PARTIAL              = 0x0f01,
+
+  TASK_FLAG_GZIP                 = 0x1000,
+  TASK_FLAG_BZIP2                = 0x2000,
+  TASK_FLAG_ZSTD                 = 0x4000,
+  TASK_FLAG_CHUNKED              = 0x8000,
+
+  TASK_TASK_MASK                 = 0x0fff,
+  TASK_CLASS_MASK                = 0x0f00,
+  TASK_FLAGS_MASK                = 0xf000
 } ot_tasktype;
 
 typedef unsigned long ot_taskid;
 
-int       mutex_workqueue_pushtask( int64 sock, ot_tasktype tasktype );
-void      mutex_workqueue_canceltask( int64 sock );
-void      mutex_workqueue_pushsuccess( ot_taskid taskid );
-ot_taskid mutex_workqueue_poptask( ot_tasktype *tasktype );
-int       mutex_workqueue_pushresult( ot_taskid taskid, int iovec_entries, struct iovec *iovector );
-int64     mutex_workqueue_popresult( int *iovec_entries, struct iovec ** iovector );
+int                   mutex_workqueue_pushtask(int64 sock, ot_tasktype tasktype);
+void                  mutex_workqueue_canceltask(int64 sock);
+void                  mutex_workqueue_pushsuccess(ot_taskid taskid);
+ot_taskid             mutex_workqueue_poptask(ot_tasktype *tasktype);
+int                   mutex_workqueue_pushresult(ot_taskid taskid, int iovec_entries, struct iovec *iovector);
+int                   mutex_workqueue_pushchunked(ot_taskid taskid, struct iovec *iovec);
+int64                 mutex_workqueue_popresult(int *iovec_entries, struct iovec **iovector, int *is_partial);
 
 #endif