Fix so that you can't right-click on non-signal channels anymore.

[nageru] / httpd.h

diff --git a/httpd.h b/httpd.h
index 21d8746172adc5231820a8c6a676d6bf08ef8ff0..6e37c5226206b3cd8f5cd5b3dcc8ea9b8b0bcecd 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -3,22 +3,23 @@
 
 // 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>
 
 struct MHD_Connection;
+struct MHD_Daemon;
 
 class HTTPD {
 public:
        HTTPD();
+       ~HTTPD();
 
        // Should be called before start().
        void set_header(const std::string &data) {
@@ -41,13 +42,15 @@ 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:
+               enum Framing {
+                       FRAMING_RAW,
+                       FRAMING_METACUBE
+               };
+               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);
 
@@ -57,18 +60,28 @@ private:
                        DATA_TYPE_OTHER
                };
                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;
+               bool should_quit = false;  // Under <buffer_mutex>.
                std::condition_variable has_buffered_data;
-               std::deque<std::string> buffered_data;  // Protected by <mutex>.
+               std::deque<std::string> buffered_data;  // Protected by <buffer_mutex>.
                size_t used_of_buffered_data = 0;  // How many bytes of the first element of <buffered_data> that is already used. Protected by <mutex>.
                size_t seen_keyframe = false;
        };
 
+       MHD_Daemon *mhd = nullptr;
        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)