X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=9b98ebab999fe6e0818528305df992c92b378f7e;hp=ed615a876574a8334757bd226529f58814e3ef70;hb=300fecae0b66a632ffee1a291522d62c840a268c;hpb=6861e5c337ba300c61d8b64a3837bb43458caa3f diff --git a/cubemap.cpp b/cubemap.cpp index ed615a8..9b98eba 100644 --- a/cubemap.cpp +++ b/cubemap.cpp @@ -11,23 +11,25 @@ #include #include #include +#include #include #include #include +#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) @@ -77,7 +79,6 @@ int create_server_socket(int port) void *acceptor_thread_run(void *arg) { int server_sock = int(intptr_t(arg)); - int num_accepted = 0; for ( ;; ) { sockaddr_in6 addr; socklen_t addrlen = sizeof(addr); @@ -100,8 +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); - ++num_accepted; + servers->add_client(sock); } } @@ -174,49 +174,103 @@ CubemapStateProto read_tempfile(int state_fd) 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; + set deserialized_stream_ids; + 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)); + deserialized_stream_ids.insert(loaded_state.streams(i).stream_id()); } // 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. + set expecting_stream_ids = deserialized_stream_ids; + 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]; + if (deserialized_stream_ids.count(stream_id) == 0) { + servers->add_stream(stream_id); + } + expecting_stream_ids.erase(stream_id); + } + + // Warn about any servers we've lost. + // TODO: Make an option (delete=yes?) to actually shut down streams. + for (set::const_iterator stream_it = expecting_stream_ids.begin(); + stream_it != expecting_stream_ids.end(); + ++stream_it) { + fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n", + stream_it->c_str()); + fprintf(stderr, " It will not be deleted, but clients will not get any new inputs.\n"); } - 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); @@ -224,14 +278,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) { @@ -241,7 +300,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 +309,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);