Make the list of sleeping clients be per-stream instead of global, so we do not wake...

[cubemap] / server.h

diff --git a/server.h b/server.h
index cc1b78dd2a6a95da7fd7e4ec9819714c2170518c..d87e7dfab0d8dd9a08423b7b2c47b998e2b277a2 100644 (file)
--- a/server.h
+++ b/server.h
@@ -15,6 +15,7 @@
 
 class ClientProto;
 class CubemapStateProto;
+class Stream;
 class StreamProto;
 
 struct Client {
@@ -22,7 +23,7 @@ struct Client {
        Client(int sock);
 
        // Serialization/deserialization.
-       Client(const ClientProto &serialized);
+       Client(const ClientProto &serialized, Stream *stream);
        ClientProto serialize() const;
 
        // The file descriptor associated with this socket.
@@ -38,6 +39,7 @@ struct Client {
        // What stream we're connecting to; parsed from <request>.
        // Not relevant for READING_REQUEST.
        std::string stream_id;
+       Stream *stream;
 
        // The header we want to send. This is nominally a copy of Stream::header,
        // but since that might change on reconnects etc., we keep a local copy here.
@@ -71,6 +73,23 @@ struct Stream {
        // How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
        // since the buffer wraps.
        size_t data_size;
+       
+       // Clients that are in SENDING_DATA, but that we don't listen on,
+       // because we currently don't have any data for them.
+       // See put_client_to_sleep() and wake_up_all_clients().
+       std::vector<Client *> sleeping_clients;
+
+       // Clients that we recently got data for (when they were in
+       // <sleeping_clients>).
+       std::vector<Client *> to_process;
+
+       // 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.
+       void put_client_to_sleep(Client *client);
+
+       // We have more data, so mark all clients that are sleeping as ready to go.
+       void wake_up_all_clients();
 
 private:
        Stream(const Stream& other);
@@ -117,17 +136,25 @@ private:
        int epoll_fd;
        epoll_event events[EPOLL_MAX_EVENTS];
 
-       // Clients that are in SENDING_DATA, but that we don't listen on,
-       // because we currently don't have any data for them.
-       // See put_client_to_sleep() and wake_up_all_clients().
-       std::vector<int> sleeping_clients;
-
        // Recover the this pointer, and call do_work().
        static void *do_work_thunk(void *arg);
 
        // The actual worker thread.
        void do_work();
 
+       // Process a client; read and write data as far as we can.
+       // After this call, one of these four is true:
+       //
+       //  1. The socket is closed, and the client deleted.
+       //  2. We are still waiting for more data from the client.
+       //  3. We've sent all the data we have to the client,
+       //     and put it in <sleeping_clients>.
+       //  4. The socket buffer is full (which means we still have
+       //     data outstanding).
+       //
+       // For #2, we listen for EPOLLIN events. For #3 and #4, we listen
+       // for EPOLLOUT in edge-triggered mode; it will never fire for #3,
+       // but it's cheaper than taking it in and out all the time.
        void process_client(Client *client);
 
        // Close a given client socket, and clean up after it.
@@ -144,14 +171,6 @@ private:
        // the SENDING_ERROR state.
        void construct_error(Client *client, int error_code);
 
-       // 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.
-       void put_client_to_sleep(Client *client);
-
-       // We have more data, so mark all clients that are sleeping as ready to go.
-       void wake_up_all_clients();
-
        // TODO: This function should probably die.
        Stream *find_stream(const std::string &stream_id);
 };