Update the queue length metric after trimming, not before.

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index 314a34a4a1cd377b2c942b934ca99f2d1dfefee2..6e37c5226206b3cd8f5cd5b3dcc8ea9b8b0bcecd 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -3,13 +3,12 @@
 
 // A class dealing with stream output to HTTP.
 
-#include <microhttpd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
+#include <atomic>
 #include <condition_variable>
 #include <deque>
-#include <memory>
 #include <mutex>
 #include <set>
 #include <string>
@@ -43,10 +42,6 @@ private:
 
        static void free_stream(void *cls);
 
-       static void request_completed_thunk(void *cls, struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
-
-       void request_completed(struct MHD_Connection *connection, void **con_cls, enum MHD_RequestTerminationCode toe);
-
 
        class Stream {
        public:
@@ -54,7 +49,7 @@ private:
                        FRAMING_RAW,
                        FRAMING_METACUBE
                };
-               Stream(Framing framing) : framing(framing) {}
+               Stream(HTTPD *parent, Framing framing) : parent(parent), framing(framing) {}
 
                static ssize_t reader_callback_thunk(void *cls, uint64_t pos, char *buf, size_t max);
                ssize_t reader_callback(uint64_t pos, char *buf, size_t max);
@@ -66,8 +61,10 @@ private:
                };
                void add_data(const char *buf, size_t size, DataType data_type);
                void stop();
+               HTTPD *get_parent() const { return parent; }
 
        private:
+               HTTPD *parent;
                Framing framing;
 
                std::mutex buffer_mutex;
@@ -82,6 +79,9 @@ private:
        std::mutex streams_mutex;
        std::set<Stream *> streams;  // Not owned.
        std::string header;
+
+       // Metrics.
+       std::atomic<int64_t> metric_num_connected_clients{0};
 };
 
 #endif  // !defined(_HTTPD_H)