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

[cubemap] / server.h

diff --git a/server.h b/server.h
index 300ec0d41115f53640068691947481cc24f44c45..79794939280cf315359f602344d3681d287054e0 100644 (file)
--- a/server.h
+++ b/server.h
@@ -16,6 +16,7 @@
 
 class ClientProto;
 class CubemapStateProto;
+class MarkPool;
 class Stream;
 class StreamProto;
 
@@ -40,6 +41,9 @@ struct Client {
        // 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;
@@ -98,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.
@@ -127,6 +134,10 @@ public:
        // 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.