When a transfer ends, output the URL.

[cubemap] / cubemap.cpp

diff --git a/cubemap.cpp b/cubemap.cpp
index 8dff03b58010e9f2c86a938ff177f64b7a001d24..ad218db29bcfb8985a5d70160886a6f9439f7c24 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; 
        }
 }
@@ -255,6 +255,36 @@ vector<ConfigLine> parse_config(const string &filename)
        return ret;
 }
 
+// Note: Limits are inclusive.
+int fetch_config_int(const vector<ConfigLine> &config, const string &keyword, int min_limit, int max_limit)
+{
+       bool value_found = false;
+       int value = -1;
+       for (unsigned i = 0; i < config.size(); ++i) {
+               if (config[i].keyword != keyword) {
+                       continue;
+               }
+               if (config[i].parameters.size() > 0 ||
+                   config[i].arguments.size() != 1) {
+                       fprintf(stderr, "ERROR: '%s' takes one argument and no parameters\n", keyword.c_str());
+                       exit(1);
+               }
+               value_found = true;
+               value = atoi(config[i].arguments[0].c_str());  // TODO: verify int validity.
+       }
+       if (!value_found) {
+               fprintf(stderr, "ERROR: Missing '%s' statement in config file.\n",
+                       keyword.c_str());
+               exit(1);
+       }
+       if (value < min_limit || value > max_limit) {
+               fprintf(stderr, "ERROR: '%s' is set to %d, must be in [%d,%d]\n",
+                       keyword.c_str(), value, min_limit, max_limit);
+               exit(1);
+       }
+       return value;
+}
+
 int main(int argc, char **argv)
 {
        fprintf(stderr, "\nCubemap starting.\n");
@@ -262,25 +292,10 @@ int main(int argc, char **argv)
        string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
        vector<ConfigLine> config = parse_config(config_filename);
 
-       // 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);
-       }
+       int port = fetch_config_int(config, "port", 1, 65535);
+       int num_servers = fetch_config_int(config, "num_servers", 1, 20000);  // Insanely high max limit.
 
-       // 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 +305,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 +321,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 +334,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 +354,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 +367,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);