1 files changed, 73 insertions, 6 deletions

diff --git a/trackerlogic.h b/trackerlogic.h
index aa10a54..ad6c911 100644
--- a/trackerlogic.h
+++ b/trackerlogic.h
@@ -6,6 +6,7 @@
 #ifndef OT_TRACKERLOGIC_H__
 #define OT_TRACKERLOGIC_H__
 
+#include <stdatomic.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/time.h>
@@ -67,10 +68,28 @@ typedef struct {
    on startup */
 #define RANDOMTORRENTS                (1024 * 1024 * 1)
 
-/* From opentracker.c */
-extern time_t       g_now_seconds;
-extern volatile int g_opentracker_running;
-#define g_now_minutes (g_now_seconds / 60)
+#if defined(CLOCK_REALTIME_COARSE)
+#define OT_CLOCK_CHEAP CLOCK_REALTIME_COARSE /* Linux */
+#elif defined(CLOCK_REALTIME_FAST)
+#define OT_CLOCK_CHEAP CLOCK_REALTIME_FAST /* the BSDs */
+#else
+#define OT_CLOCK_CHEAP CLOCK_REALTIME /* macOS and whatever else */
+#endif
+
+static inline ot_time time_now_seconds(void) {
+  struct timespec now;
+  clock_gettime(OT_CLOCK_CHEAP, &now);
+  return (ot_time)now.tv_sec;
+}
+
+static inline ot_time time_now_minutes(void) { return time_now_seconds() / 60; }
+
+/* For the deadlines the tracker sets on itself, which read better as the
+   span they allow than as an addition to the current second */
+static inline ot_time time_future_seconds(int span) { return time_now_seconds() + span; }
+/* Cleared from the interrupt handler and read by every worker */
+extern _Atomic int    g_opentracker_running;
+
 
 extern uint32_t g_tracker_id;
 typedef enum { FLAG_TCP, FLAG_UDP, FLAG_MCA, FLAG_SELFPIPE } PROTO_FLAG;
@@ -129,8 +148,56 @@ struct ot_peerlist {
 };
 #define OT_PEERLIST_HASBUCKETS(peer_list) ((peer_list)->peers.size > (peer_list)->peers.space)
 
+/* The http replies the tracker counts when it has to refuse a request. */
+enum {
+  CODE_HTTPERROR_302,
+  CODE_HTTPERROR_400,
+  CODE_HTTPERROR_400_PARAM,
+  CODE_HTTPERROR_400_COMPACT,
+  CODE_HTTPERROR_402_NOTMODEST,
+  CODE_HTTPERROR_402_PAYMENT_REQUIRED,
+  CODE_HTTPERROR_403_IP,
+  CODE_HTTPERROR_404,
+  CODE_HTTPERROR_500,
+
+  CODE_HTTPERROR_COUNT
+};
+
+/* One statistic. Used when workers report stats to their workstruct */
+typedef _Atomic unsigned long long ot_counter;
+
+/* What each thread counts for itself. The two runs at the end are indexed by
+   the http error code and by the age in minutes of a renewed peer */
+typedef enum {
+  OT_COUNTER_TCP_CONNECTIONS,
+  OT_COUNTER_UDP_CONNECTIONS,
+  OT_COUNTER_TCP_ANNOUNCES,
+  OT_COUNTER_UDP_ANNOUNCES,
+  OT_COUNTER_TCP_SCRAPES,
+  OT_COUNTER_UDP_SCRAPES,
+  OT_COUNTER_TCP_CONNECTS,
+  OT_COUNTER_UDP_CONNECTS,
+  OT_COUNTER_UDP_CONNID_MISSMATCH,
+  OT_COUNTER_COMPLETED,
+  OT_COUNTER_FULLSCRAPES,
+  OT_COUNTER_FULLSCRAPE_REQUESTS,
+  OT_COUNTER_FULLSCRAPE_BYTES,
+  OT_COUNTER_SYNCS,
+  OT_COUNTER_STALLS,
+
+  OT_COUNTER_FAILED,                                             /* CODE_HTTPERROR_COUNT of them */
+  OT_COUNTER_RENEWED = OT_COUNTER_FAILED + CODE_HTTPERROR_COUNT, /* OT_PEER_TIMEOUT of them */
+
+  OT_COUNTER_COUNT   = OT_COUNTER_RENEWED + OT_PEER_TIMEOUT
+} ot_counter_index;
+
 struct ot_workstruct {
   /* Thread specific, static */
+
+  /* This thread's own statistics, and the link ot_stats keeps them on */
+  ot_counter            counters[OT_COUNTER_COUNT];
+  struct ot_workstruct *counters_next;
+
   char *inbuf;
 #define G_INBUF_SIZE 8192
   char *outbuf;
@@ -181,13 +248,13 @@ struct ot_workstruct {
 
 void   trackerlogic_init(void);
 void   trackerlogic_deinit(void);
-void   exerr(char *message);
+void   exerr(const char *message);
 
 /* add_peer_to_torrent does only release the torrent bucket if from_sync is set,
    otherwise it is released in return_peers_for_torrent */
 size_t add_peer_to_torrent_and_return_peers(PROTO_FLAG proto, struct ot_workstruct *ws, size_t amount);
 size_t remove_peer_from_torrent(PROTO_FLAG proto, struct ot_workstruct *ws);
-size_t return_tcp_scrape_for_torrent(ot_hash const *hash_list, size_t amount, char *reply);
+void   return_tcp_scrape_for_torrent(ot_hash const *hash_list, size_t amount, char **reply, const char *reply_end);
 size_t return_udp_scrape_for_torrent(ot_hash const hash, char *reply);
 void   add_torrent_from_saved_state(ot_hash const hash, ot_time base, size_t down_count);
 #ifdef _DEBUG_RANDOMTORRENTS