Wrap the acceptor into the same thread logic as everything else.

[cubemap] / server.h

diff --git a/server.h b/server.h
index 5ebc060e10924e88c675f695fe6caefcb8cd520b..79794939280cf315359f602344d3681d287054e0 100644 (file)
--- a/server.h
+++ b/server.h
@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <pthread.h>
 #include <sys/epoll.h>
+#include <time.h>
 #include <string>
 #include <map>
 #include <vector>
@@ -15,9 +16,18 @@
 
 class ClientProto;
 class CubemapStateProto;
+class MarkPool;
 class Stream;
 class StreamProto;
 
+// Digested statistics for writing to logs etc.
+struct ClientStats {
+       std::string stream_id;
+       std::string remote_addr;
+       time_t connect_time;
+       size_t bytes_sent;
+};
+
 struct Client {
        Client() {}
        Client(int sock);
@@ -26,9 +36,18 @@ struct Client {
        Client(const ClientProto &serialized, Stream *stream);
        ClientProto serialize() const;
 
+       ClientStats get_stats() const;
+
        // The file descriptor associated with this socket.
        int sock;
 
+       // The fwmark associated with this socket (or 0).
+       int fwmark;
+
+       // Some information only used for logging.
+       std::string remote_addr;
+       time_t connect_time;
+
        enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR };
        State state;
 
@@ -83,6 +102,9 @@ struct Stream {
        // <sleeping_clients>).
        std::vector<Client *> to_process;
 
+       // What pool to fetch marks from, or NULL.
+       MarkPool *mark_pool;
+
        // Put client to sleep, since there is no more data for it; we will on
        // longer listen on POLLOUT until we get more data. Also, it will be put
        // in the list of clients to wake up when we do.
@@ -105,10 +127,17 @@ public:
 
        // Stop the thread.
        void stop();
+       
+       // Get the list of all currently connected clients.     
+       std::vector<ClientStats> get_client_stats() const;
 
        // Set header (both HTTP header and any stream headers) for the given stream.
        void set_header(const std::string &stream_id, const std::string &header);
 
+       // Set that the given stream should use the given mark pool from now on.
+       // NOTE: This should be set before any clients are connected!
+       void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+
        // These will be deferred until the next time an iteration in do_work() happens,
        // and the order between them are undefined.
        // XXX: header should ideally be ordered with respect to data.
@@ -128,7 +157,7 @@ private:
 
        // Mutex protecting queued_data only. Note that if you want to hold both this
        // and <mutex> below, you will need to take <mutex> before this one.
-       pthread_mutex_t queued_data_mutex;
+       mutable pthread_mutex_t queued_data_mutex;
 
        // Deferred commands that should be run from the do_work() thread as soon as possible.
        // We defer these for two reasons:
@@ -144,7 +173,7 @@ private:
        std::map<std::string, std::string> queued_data;
 
        // All variables below this line are protected by the mutex.
-       pthread_mutex_t mutex;
+       mutable pthread_mutex_t mutex;
 
        // If the thread should stop or not.
        bool should_stop;