Move the logic of load-balancing etc. into ServerPool, which frees external users...

[cubemap] / server.h

diff --git a/server.h b/server.h
index dea24d894e4cf9e5c9ea5ab7d3e96fa77f861a08..2cb078e3fc418bdd6b47665bba31635b3af6e4e2 100644 (file)
--- a/server.h
+++ b/server.h
@@ -3,16 +3,28 @@
 
 #include <stdint.h>
 #include <pthread.h>
 
 #include <stdint.h>
 #include <pthread.h>

+#include <sys/epoll.h>

 #include <string>
 #include <map>
 #include <string>
 #include <map>

+#include <vector>

 
 

-#define NUM_SERVERS 4

 #define BACKLOG_SIZE 1048576
 #define EPOLL_MAX_EVENTS 8192
 #define EPOLL_TIMEOUT_MS 20
 #define MAX_CLIENT_REQUEST 16384
 
 #define BACKLOG_SIZE 1048576
 #define EPOLL_MAX_EVENTS 8192
 #define EPOLL_TIMEOUT_MS 20
 #define MAX_CLIENT_REQUEST 16384
 

+class ClientProto;
+class CubemapStateProto;
+class StreamProto;
+

 struct Client {
 struct Client {

+       Client() {}
+       Client(int sock);
+
+       // Serialization/deserialization.
+       Client(const ClientProto &serialized);
+       ClientProto serialize() const;
+

        // The file descriptor associated with this socket.
        int sock;
 
        // The file descriptor associated with this socket.
        int sock;
 


@@ -40,33 +52,62 @@ struct Client {
 };
 
 struct Stream {
 };
 
 struct Stream {

+       Stream(const std::string &stream_id);
+       ~Stream();
+
+       // Serialization/deserialization.
+       Stream(const StreamProto &serialized);
+       StreamProto serialize() const;
+
+       std::string stream_id;
+

        // The HTTP response header, plus the video stream header (if any).
        std::string header;
 
        // The stream data itself, stored in a circular buffer.
        // The HTTP response header, plus the video stream header (if any).
        std::string header;
 
        // The stream data itself, stored in a circular buffer.

-       char data[BACKLOG_SIZE];
+       char *data;

 
        // How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
        // since the buffer wraps.
        size_t data_size;
 
        // How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
        // since the buffer wraps.
        size_t data_size;

+
+private:
+       Stream(const Stream& other);

 };
 
 class Server {
 public:
        Server();
 };
 
 class Server {
 public:
        Server();

+       ~Server();

 
        // Start a new thread that handles clients.
        void run();
 
        // Start a new thread that handles clients.
        void run();

+
+       // Stop the thread.
+       void stop();
+
+       CubemapStateProto serialize() const;
+

        void add_client(int sock);
        void add_client(int sock);

+       void add_client_from_serialized(const ClientProto &client);
+

        void add_stream(const std::string &stream_id);
        void add_stream(const std::string &stream_id);

+       void add_stream_from_serialized(const StreamProto &stream);
+

        void set_header(const std::string &stream_id, const std::string &header);
        void add_data(const std::string &stream_id, const char *data, size_t bytes);
 
 private:
        void set_header(const std::string &stream_id, const std::string &header);
        void add_data(const std::string &stream_id, const char *data, size_t bytes);
 
 private:

+       pthread_t worker_thread;
+
+       // All variables below this line are protected by the mutex.

        pthread_mutex_t mutex;
 
        pthread_mutex_t mutex;
 

+       // If the thread should stop or not.
+       bool should_stop;       
+

        // Map from stream ID to stream.
        // Map from stream ID to stream.

-       std::map<std::string, Stream> streams;
+       std::map<std::string, Stream *> streams;

 
        // Map from file descriptor to client.
        std::map<int, Client> clients;
 
        // Map from file descriptor to client.
        std::map<int, Client> clients;


@@ -91,10 +132,13 @@ private:
        // Close a given client socket, and clean up after it.
        void close_client(Client *client);
 
        // Close a given client socket, and clean up after it.
        void close_client(Client *client);
 

-       // Parse the HTTP request, construct the header, and set the client into
-       // the SENDING_HEADER state.
+       // Parse the HTTP request.

        void parse_request(Client *client);
 
        void parse_request(Client *client);
 

+       // Construct the HTTP header, and set the client into
+       // the SENDING_HEADER state.
+       void construct_header(Client *client);
+

        // 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.
        // 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.


@@ -102,6 +146,9 @@ private:
 
        // We have more data, so mark all clients that are sleeping as ready to go.
        void wake_up_all_clients();
 
        // 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);

 };
 
 #endif  // !defined(_SERVER_H)
 };
 
 #endif  // !defined(_SERVER_H)