Fetch num_servers from the config file.

[cubemap] / cubemap.cpp

diff --git a/cubemap.cpp b/cubemap.cpp
index 8dff03b58010e9f2c86a938ff177f64b7a001d24..253ec3721734d9231e66a986adda2c4cdef9cb39 100644 (file)
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -18,16 +18,16 @@
 
 #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/"
 
 using namespace std;
 
-Server *servers = NULL;
+ServerPool *servers = NULL;
 volatile bool hupped = false;
 
 void hup(int ignored)
@@ -100,7 +100,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; 
        }
 }
@@ -263,7 +263,7 @@ int main(int argc, char **argv)
        vector<ConfigLine> config = parse_config(config_filename);
 
        // Go through each (parsed) configuration line.
-       int port = -1;
+       int port = -1, num_servers = -1;
        for (unsigned i = 0; i < config.size(); ++i) {
                if (config[i].keyword == "port") {
                        if (config[i].parameters.size() > 0 ||
@@ -273,14 +273,25 @@ int main(int argc, char **argv)
                        }
                        port = atoi(config[i].arguments[0].c_str());
                }
+               if (config[i].keyword == "num_servers") {
+                       if (config[i].parameters.size() > 0 ||
+                           config[i].arguments.size() != 1) {
+                               fprintf(stderr, "ERROR: 'num_servers' takes one argument and no parameters\n");
+                               exit(1);
+                       }
+                       num_servers = 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);
        }
+       if (num_servers <= 0 || num_servers > 20000) {  // 20000 is an insanely high max limit.
+               fprintf(stderr, "ERROR: Missing or invalid 'num_servers' statement in config file\n");
+               exit(1);
+       }
 
-       // Create the servers.
-       servers = new Server[NUM_SERVERS];
+       servers = new ServerPool(num_servers);
 
        int server_sock = -1, old_port = -1;
        if (argc == 4 && strcmp(argv[2], "-state") == 0) {
@@ -290,15 +301,13 @@ 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.
@@ -308,9 +317,7 @@ int main(int argc, char **argv)
                fprintf(stderr, "done.\n");
        } else{
                // TODO: This should come from the config file.
-               for (int i = 0; i < NUM_SERVERS; ++i) {
-                       servers[i].add_stream(STREAM_ID);
-               }
+               servers->add_stream(STREAM_ID);
        }
 
        // Open a new server socket if we do not already have one, or if we changed ports.
@@ -323,10 +330,7 @@ int main(int argc, char **argv)
                server_sock = create_server_socket(port);
        }
 
-       // Start up all the servers!
-       for (int i = 0; i < NUM_SERVERS; ++i) {
-               servers[i].run();
-       }
+       servers->run();
 
        pthread_t acceptor_thread;
        pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
@@ -346,10 +350,10 @@ int main(int argc, char **argv)
        CubemapStateProto state;
        state.set_server_sock(server_sock);
        state.set_port(port);
-       for (int i = 0; i < NUM_SERVERS; ++i) {
-               servers[i].stop();
+       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) {
@@ -359,7 +363,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);