X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=b00ca64df2999057c6c1c535dee05c507790b5c8;hp=3f136aa09e23f956d76747149b0ce47c4a8a9bb5;hb=17d773d2d45d495704e974b9246eccb21faa8635;hpb=6b4c7eecb5910b35ac61452cd5515ff1ee03d1de diff --git a/cubemap.cpp b/cubemap.cpp index 3f136aa..b00ca64 100644 --- a/cubemap.cpp +++ b/cubemap.cpp @@ -17,18 +17,18 @@ #include #include "metacube.h" +#include "parse.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; } } @@ -172,89 +172,6 @@ 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); -} - int main(int argc, char **argv) { fprintf(stderr, "\nCubemap starting.\n"); @@ -262,48 +179,84 @@ int main(int argc, char **argv) string config_filename = (argc == 1) ? "cubemap.config" : argv[1]; vector config = parse_config(config_filename); - servers = new Server[NUM_SERVERS]; + 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; + 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]); CubemapStateProto loaded_state = read_tempfile(state_fd); // Deserialize the streams. + // TODO: Pick up new streams from the configuration file. 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); + // Find all streams in the configuration file, and create them. + for (unsigned i = 0; i < config.size(); ++i) { + if (config[i].keyword != "stream") { + continue; + } + if (config[i].arguments.size() != 1) { + fprintf(stderr, "ERROR: 'stream' takes exactly one argument\n"); + exit(1); + } + string stream_id = config[i].arguments[0]; + 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)); - Input input(STREAM_ID, STREAM_URL); - input.run(); + // Find all streams in the configuration file, and create inputs for them. + vector inputs; + for (unsigned i = 0; i < config.size(); ++i) { + if (config[i].keyword != "stream") { + continue; + } + assert(config[i].arguments.size() == 1); + string stream_id = config[i].arguments[0]; + + if (config[i].parameters.count("src") == 0) { + fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n", + stream_id.c_str()); + continue; + } + + string src = config[i].parameters["src"]; + Input *input = new Input(stream_id, src); + input->run(); + inputs.push_back(input); + } signal(SIGHUP, hup); @@ -311,14 +264,19 @@ int main(int argc, char **argv) usleep(100000); } - input.stop(); + // OK, we've been HUPed. Time to shut down everything, serialize, and re-exec. + for (size_t i = 0; i < inputs.size(); ++i) { + inputs[i]->stop(); + delete inputs[i]; // TODO: serialize instead of using libcurl. + } 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 +286,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);