X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=ad218db29bcfb8985a5d70160886a6f9439f7c24;hp=ed615a876574a8334757bd226529f58814e3ef70;hb=1a6917f77ba35d5397e887a554354a3e49458eb9;hpb=6861e5c337ba300c61d8b64a3837bb43458caa3f diff --git a/cubemap.cpp b/cubemap.cpp index ed615a8..ad218db 100644 --- a/cubemap.cpp +++ b/cubemap.cpp @@ -11,23 +11,23 @@ #include #include #include +#include #include #include #include #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) @@ -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; } } @@ -171,50 +171,175 @@ CubemapStateProto read_tempfile(int state_fd) return state; } +// Split a line on whitespace, e.g. "foo bar baz" -> {"foo", "bar", "baz"}. +vector split_tokens(const string &line) +{ + vector ret; + string current_token; + + for (size_t i = 0; i < line.size(); ++i) { + if (isspace(line[i])) { + if (!current_token.empty()) { + ret.push_back(current_token); + } + current_token.clear(); + } else { + current_token.push_back(line[i]); + } + } + if (!current_token.empty()) { + ret.push_back(current_token); + } + return ret; +} + +struct ConfigLine { + string keyword; + vector arguments; + map parameters; +}; + +// Parse the configuration file. +vector parse_config(const string &filename) +{ + vector ret; + + FILE *fp = fopen(filename.c_str(), "r"); + if (fp == NULL) { + perror(filename.c_str()); + exit(1); + } + + char buf[4096]; + while (!feof(fp)) { + if (fgets(buf, sizeof(buf), fp) == NULL) { + break; + } + + // Chop off the string at the first #, \r or \n. + buf[strcspn(buf, "#\r\n")] = 0; + + // Remove all whitespace from the end of the string. + size_t len = strlen(buf); + while (len > 0 && isspace(buf[len - 1])) { + buf[--len] = 0; + } + + // If the line is now all blank, ignore it. + if (len == 0) { + continue; + } + + vector tokens = split_tokens(buf); + assert(!tokens.empty()); + + ConfigLine line; + line.keyword = tokens[0]; + + for (size_t i = 1; i < tokens.size(); ++i) { + // foo=bar is a parameter; anything else is an argument. + size_t equals_pos = tokens[i].find_first_of('='); + if (equals_pos == string::npos) { + line.arguments.push_back(tokens[i]); + } else { + string key = tokens[i].substr(0, equals_pos); + string value = tokens[i].substr(equals_pos + 1, string::npos); + line.parameters.insert(make_pair(key, value)); + } + } + + ret.push_back(line); + } + + fclose(fp); + return ret; +} + +// Note: Limits are inclusive. +int fetch_config_int(const vector &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"); - - servers = new Server[NUM_SERVERS]; - int server_sock; - if (argc == 3 && strcmp(argv[1], "-state") == 0) { + string config_filename = (argc == 1) ? "cubemap.config" : argv[1]; + vector config = parse_config(config_filename); + + int port = fetch_config_int(config, "port", 1, 65535); + int num_servers = fetch_config_int(config, "num_servers", 1, 20000); // Insanely high max limit. + + servers = new ServerPool(num_servers); + + 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[2]); + int state_fd = atoi(argv[3]); CubemapStateProto loaded_state = read_tempfile(state_fd); // 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(server_sock)); + // TODO: This should come from the config file. Input input(STREAM_ID, STREAM_URL); input.run(); @@ -228,10 +353,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) { @@ -241,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); @@ -250,7 +376,7 @@ int main(int argc, char **argv) sprintf(buf, "%d", state_fd); for ( ;; ) { - execlp(argv[0], argv[0], "-state", buf, NULL); + execlp(argv[0], argv[0], config_filename.c_str(), "-state", buf, NULL); perror("execlp"); fprintf(stderr, "PANIC: re-exec of %s failed. Waiting 0.2 seconds and trying again...\n", argv[0]); usleep(200000);