Remove some leftover code.

[cubemap] / server.h

diff --git a/server.h b/server.h
index cc1b78dd2a6a95da7fd7e4ec9819714c2170518c..fd309f41e34e1b97434f5af0071f9a47e4ad6690 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.
@@ -120,7 +122,7 @@ private:
        // 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;
+       std::vector<Client *> sleeping_clients;
 
        // Recover the this pointer, and call do_work().
        static void *do_work_thunk(void *arg);
@@ -128,6 +130,19 @@ private:
        // 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.