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 65ac6b805435f413d4e6bd0f5bfbf84e747aacff..2cb078e3fc418bdd6b47665bba31635b3af6e4e2 100644 (file)
--- a/server.h
+++ b/server.h
@@ -3,10 +3,11 @@
 
 #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 BACKLOG_SIZE 1048576
 #define EPOLL_MAX_EVENTS 8192
 #define EPOLL_TIMEOUT_MS 20


@@ -77,6 +78,7 @@ private:
 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();


@@ -87,7 +89,11 @@ public:
        CubemapStateProto serialize() const;
 
        void add_client(int sock);
        CubemapStateProto serialize() const;
 
        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);
 
        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);