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

[cubemap] / cubemap.cpp

diff --git a/cubemap.cpp b/cubemap.cpp
index 3f136aa09e23f956d76747149b0ce47c4a8a9bb5..4f03feae49f5073abc4d8f66bde35cd4632d8146 100644 (file)
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -18,17 +18,17 @@
 
 #include "metacube.h"
 #include "server.h"
+#include "serverpool.h"
 #include "input.h"
 #include "state.pb.h"
 
 #define NUM_SERVERS 4
 #define STREAM_ID "stream"
 #define STREAM_URL "http://gruessi.zrh.sesse.net:4013/"
-#define PORT 9094
 
 using namespace std;
 
-Server *servers = NULL;
+ServerPool *servers = NULL;
 volatile bool hupped = false;
 
 void hup(int ignored)
@@ -101,7 +101,7 @@ void *acceptor_thread_run(void *arg)
                }
 
                // Pick a server, round-robin, and hand over the socket to it.
-               servers[num_accepted % NUM_SERVERS].add_client(sock);
+               servers->add_client(sock);
                ++num_accepted; 
        }
 }
@@ -253,6 +253,7 @@ vector<ConfigLine> parse_config(const string &filename)
        }
 
        fclose(fp);
+       return ret;
 }
 
 int main(int argc, char **argv)
@@ -262,9 +263,26 @@ int main(int argc, char **argv)
        string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
        vector<ConfigLine> config = parse_config(config_filename);
 
-       servers = new Server[NUM_SERVERS];
+       // Go through each (parsed) configuration line.
+       int port = -1;
+       for (unsigned i = 0; i < config.size(); ++i) {
+               if (config[i].keyword == "port") {
+                       if (config[i].parameters.size() > 0 ||
+                           config[i].arguments.size() != 1) {
+                               fprintf(stderr, "ERROR: 'port' takes one argument and no parameters\n");
+                               exit(1);
+                       }
+                       port = atoi(config[i].arguments[0].c_str());
+               }
+       }
+       if (port <= 0 || port > 65535) {
+               fprintf(stderr, "ERROR: Missing or invalid 'port' statement in config file\n");
+               exit(1);
+       }
+
+       servers = new ServerPool(NUM_SERVERS);
 
-       int server_sock;
+       int server_sock = -1, old_port = -1;
        if (argc == 4 && strcmp(argv[2], "-state") == 0) {
                fprintf(stderr, "Deserializing state from previous process... ");
                int state_fd = atoi(argv[3]);
@@ -272,36 +290,41 @@ int main(int argc, char **argv)
 
                // Deserialize the streams.
                for (int i = 0; i < loaded_state.streams_size(); ++i) {
-                       for (int j = 0; j < NUM_SERVERS; ++j) {
-                               servers[j].add_stream_from_serialized(loaded_state.streams(i));
-                       }
+                       servers->add_stream_from_serialized(loaded_state.streams(i));
                }
 
                // Put back the existing clients. It doesn't matter which server we
                // allocate them to, so just do round-robin.
                for (int i = 0; i < loaded_state.clients_size(); ++i) {
-                       servers[i % NUM_SERVERS].add_client_from_serialized(loaded_state.clients(i));
+                       servers->add_client_from_serialized(loaded_state.clients(i));
                }
 
                // Deserialize the server socket.
                server_sock = loaded_state.server_sock();
+               old_port = loaded_state.port();
 
                fprintf(stderr, "done.\n");
-       } else {
-               // TODO: This should come from a config file.
-               server_sock = create_server_socket(PORT);
-               for (int i = 0; i < NUM_SERVERS; ++i) {
-                       servers[i].add_stream(STREAM_ID);
-               }
+       } else{
+               // TODO: This should come from the config file.
+               servers->add_stream(STREAM_ID);
        }
 
-       for (int i = 0; i < NUM_SERVERS; ++i) {
-               servers[i].run();
+       // Open a new server socket if we do not already have one, or if we changed ports.
+       if (server_sock != -1 && port != old_port) {
+               fprintf(stderr, "NOTE: Port changed from %d to %d; opening new socket.\n", old_port, port);
+               close(server_sock);
+               server_sock = -1;
        }
+       if (server_sock == -1) {
+               server_sock = create_server_socket(port);
+       }
+
+       servers->run();
 
        pthread_t acceptor_thread;
        pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
 
+       // TODO: This should come from the config file.
        Input input(STREAM_ID, STREAM_URL);
        input.run();
 
@@ -315,10 +338,11 @@ int main(int argc, char **argv)
 
        CubemapStateProto state;
        state.set_server_sock(server_sock);
-       for (int i = 0; i < NUM_SERVERS; ++i) {
-               servers[i].stop();
+       state.set_port(port);
+       for (int i = 0; i < NUM_SERVERS; ++i) { 
+               servers->get_server(i)->stop();
 
-               CubemapStateProto local_state = servers[i].serialize();
+               CubemapStateProto local_state = servers->get_server(i)->serialize();
 
                // The stream state should be identical between the servers, so we only store it once.
                if (i == 0) {
@@ -328,7 +352,7 @@ int main(int argc, char **argv)
                        state.add_clients()->MergeFrom(local_state.clients(j));
                }
        }
-       delete[] servers;
+       delete servers;
 
        fprintf(stderr, "Serializing state and re-execing...\n");
        int state_fd = make_tempfile(state);