X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=03ef0d7aaa5ef587cd2547be0b07b38abe0f7183;hp=69f0e9b7cb686b19293a4aef184e6b54941584b7;hb=7c4707af4ea7af05e34bc0414d18d9fd54e4f23e;hpb=99738bd173040bf4e2d2d42ffc8c7ab8c105cf75 diff --git a/main.cpp b/main.cpp index 69f0e9b..03ef0d7 100644 --- a/main.cpp +++ b/main.cpp @@ -26,6 +26,7 @@ #include "serverpool.h" #include "input.h" #include "stats.h" +#include "version.h" #include "state.pb.h" using namespace std; @@ -68,6 +69,39 @@ int make_tempfile(const CubemapStateProto &state) return state_fd; } +CubemapStateProto collect_state(const timeval &serialize_start, + const vector acceptors, + const vector inputs, + ServerPool *servers, + int num_servers) +{ + CubemapStateProto state; + state.set_serialize_start_sec(serialize_start.tv_sec); + state.set_serialize_start_usec(serialize_start.tv_usec); + + for (size_t i = 0; i < acceptors.size(); ++i) { + state.add_acceptors()->MergeFrom(acceptors[i]->serialize()); + } + + for (size_t i = 0; i < inputs.size(); ++i) { + state.add_inputs()->MergeFrom(inputs[i]->serialize()); + } + + for (int i = 0; i < num_servers; ++i) { + 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) { + state.mutable_streams()->MergeFrom(local_state.streams()); + } + for (int j = 0; j < local_state.clients_size(); ++j) { + state.add_clients()->MergeFrom(local_state.clients(j)); + } + } + + return state; +} + // Read the state back from the file descriptor made by make_tempfile, // and close it. CubemapStateProto read_tempfile(int state_fd) @@ -154,56 +188,98 @@ MarkPool *parse_mark_pool(map, MarkPool *> *mark_pools, const str return get_mark_pool(mark_pools, from, to); } -int main(int argc, char **argv) +// Find all port statements in the configuration file, and create acceptors for htem. +vector create_acceptors( + const vector &config, + map *deserialized_acceptors) { - fprintf(stderr, "\nCubemap starting.\n"); - - struct timeval serialize_start; - bool is_reexec = false; - - string config_filename = (argc == 1) ? "cubemap.config" : argv[1]; - vector config = parse_config(config_filename); - - int port = fetch_config_int(config, "port", 1, 65535, PARAMATER_MANDATORY); - int num_servers = fetch_config_int(config, "num_servers", 1, 20000, PARAMATER_MANDATORY); // Insanely high max limit. - - servers = new ServerPool(num_servers); + vector acceptors; + for (unsigned i = 0; i < config.size(); ++i) { + if (config[i].keyword != "port") { + continue; + } + if (config[i].arguments.size() != 1) { + fprintf(stderr, "ERROR: 'port' takes exactly one argument\n"); + exit(1); + } + int port = atoi(config[i].arguments[0].c_str()); + if (port < 1 || port >= 65536) { + fprintf(stderr, "WARNING: port %d is out of range (must be [1,65536>), ignoring\n", port); + continue; + } - CubemapStateProto loaded_state; - int server_sock = -1, old_port = -1; - set deserialized_stream_ids; - map deserialized_inputs; - if (argc == 4 && strcmp(argv[2], "-state") == 0) { - is_reexec = true; + Acceptor *acceptor = NULL; + map::iterator deserialized_acceptor_it = + deserialized_acceptors->find(port); + if (deserialized_acceptor_it != deserialized_acceptors->end()) { + acceptor = deserialized_acceptor_it->second; + deserialized_acceptors->erase(deserialized_acceptor_it); + } else { + int server_sock = create_server_socket(port); + acceptor = new Acceptor(server_sock, port); + } + acceptor->run(); + acceptors.push_back(acceptor); + } - fprintf(stderr, "Deserializing state from previous process... "); - int state_fd = atoi(argv[3]); - loaded_state = read_tempfile(state_fd); + // Close all acceptors that are no longer in the configuration file. + for (map::iterator acceptor_it = deserialized_acceptors->begin(); + acceptor_it != deserialized_acceptors->end(); + ++acceptor_it) { + acceptor_it->second->close_socket(); + delete acceptor_it->second; + } - serialize_start.tv_sec = loaded_state.serialize_start_sec(); - serialize_start.tv_usec = loaded_state.serialize_start_usec(); + return acceptors; +} - // Deserialize the streams. - for (int i = 0; i < loaded_state.streams_size(); ++i) { - servers->add_stream_from_serialized(loaded_state.streams(i)); - deserialized_stream_ids.insert(loaded_state.streams(i).stream_id()); +// Find all streams in the configuration file, and create inputs for them. +vector create_inputs(const vector &config, + map *deserialized_inputs) +{ + 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]; - // Deserialize the inputs. Note that we don't actually add them to any state yet. - for (int i = 0; i < loaded_state.inputs_size(); ++i) { - deserialized_inputs.insert(make_pair( - loaded_state.inputs(i).stream_id(), - new Input(loaded_state.inputs(i)))); - } - - // Deserialize the server socket. - server_sock = loaded_state.server_sock(); - old_port = loaded_state.port(); + map::const_iterator src_it = + config[i].parameters.find("src"); + if (src_it == config[i].parameters.end()) { + fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n", + stream_id.c_str()); + continue; + } - fprintf(stderr, "done.\n"); + string src = src_it->second; + Input *input = NULL; + map::iterator deserialized_input_it = + deserialized_inputs->find(stream_id); + if (deserialized_input_it != deserialized_inputs->end()) { + input = deserialized_input_it->second; + if (input->get_url() != src) { + fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n", + stream_id.c_str(), input->get_url().c_str(), src.c_str()); + delete input; + input = NULL; + } + deserialized_inputs->erase(deserialized_input_it); + } + if (input == NULL) { + input = create_input(stream_id, src); + } + input->run(); + inputs.push_back(input); } + return inputs; +} - // Find all streams in the configuration file, and create them. +void create_streams(const vector &config, + const set &deserialized_stream_ids, + map *deserialized_inputs) +{ set expecting_stream_ids = deserialized_stream_ids; map, MarkPool *> mark_pools; for (unsigned i = 0; i < config.size(); ++i) { @@ -221,8 +297,10 @@ int main(int argc, char **argv) expecting_stream_ids.erase(stream_id); // Set up marks, if so desired. - if (config[i].parameters.count("mark")) { - MarkPool *mark_pool = parse_mark_pool(&mark_pools, config[i].parameters["mark"]); + map::const_iterator mark_parm_it = + config[i].parameters.find("mark"); + if (mark_parm_it != config[i].parameters.end()) { + MarkPool *mark_pool = parse_mark_pool(&mark_pools, mark_parm_it->second); servers->set_mark_pool(stream_id, mark_pool); } } @@ -236,71 +314,85 @@ int main(int argc, char **argv) fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n", stream_id.c_str()); fprintf(stderr, " It will not be deleted, but clients will not get any new inputs.\n"); - if (deserialized_inputs.count(stream_id) != 0) { - delete deserialized_inputs[stream_id]; - deserialized_inputs.erase(stream_id); + if (deserialized_inputs->count(stream_id) != 0) { + delete (*deserialized_inputs)[stream_id]; + deserialized_inputs->erase(stream_id); } } +} - // 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); +int main(int argc, char **argv) +{ + fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n"); + + struct timeval serialize_start; + bool is_reexec = false; + + string config_filename = (argc == 1) ? "cubemap.config" : argv[1]; + vector config = parse_config(config_filename); + + int num_servers = fetch_config_int(config, "num_servers", 1, 20000, PARAMATER_MANDATORY); // Insanely high max limit. + + servers = new ServerPool(num_servers); + + CubemapStateProto loaded_state; + set deserialized_stream_ids; + map deserialized_inputs; + map deserialized_acceptors; + if (argc == 4 && strcmp(argv[2], "-state") == 0) { + is_reexec = true; + + fprintf(stderr, "Deserializing state from previous process... "); + int state_fd = atoi(argv[3]); + loaded_state = read_tempfile(state_fd); + + serialize_start.tv_sec = loaded_state.serialize_start_sec(); + serialize_start.tv_usec = loaded_state.serialize_start_usec(); + + // Deserialize the streams. + for (int i = 0; i < loaded_state.streams_size(); ++i) { + servers->add_stream_from_serialized(loaded_state.streams(i)); + deserialized_stream_ids.insert(loaded_state.streams(i).stream_id()); + } + + // Deserialize the inputs. Note that we don't actually add them to any state yet. + for (int i = 0; i < loaded_state.inputs_size(); ++i) { + deserialized_inputs.insert(make_pair( + loaded_state.inputs(i).stream_id(), + create_input(loaded_state.inputs(i)))); + } + + // Convert the acceptor from older serialized formats. + if (loaded_state.has_server_sock() && loaded_state.has_port()) { + AcceptorProto *acceptor = loaded_state.add_acceptors(); + acceptor->set_server_sock(loaded_state.server_sock()); + acceptor->set_port(loaded_state.port()); + } + + // Deserialize the acceptors. + for (int i = 0; i < loaded_state.acceptors_size(); ++i) { + deserialized_acceptors.insert(make_pair( + loaded_state.acceptors(i).port(), + new Acceptor(loaded_state.acceptors(i)))); + } + + fprintf(stderr, "done.\n"); } + // Find all streams in the configuration file, and create them. + create_streams(config, deserialized_stream_ids, &deserialized_inputs); + // See if the user wants stats. string stats_file = fetch_config_string(config, "stats_file", PARAMETER_OPTIONAL); int stats_interval = fetch_config_int(config, "stats_interval", 1, INT_MAX, PARAMETER_OPTIONAL, -1); if (stats_interval != -1 && stats_file.empty()) { fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n"); } - StatsThread *stats_thread = NULL; - if (!stats_file.empty()) { - stats_thread = new StatsThread(stats_file, stats_interval); - } servers->run(); - AcceptorThread acceptor_thread(server_sock); - acceptor_thread.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 = NULL; - if (deserialized_inputs.count(stream_id) != 0) { - input = deserialized_inputs[stream_id]; - if (input->get_url() != src) { - fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n", - stream_id.c_str(), input->get_url().c_str(), src.c_str()); - delete input; - input = NULL; - } - deserialized_inputs.erase(stream_id); - } - if (input == NULL) { - input = new Input(stream_id, src); - } - input->run(); - inputs.push_back(input); - } + vector acceptors = create_acceptors(config, &deserialized_acceptors); + vector inputs = create_inputs(config, &deserialized_inputs); // All deserialized inputs should now have been taken care of, one way or the other. assert(deserialized_inputs.empty()); @@ -315,7 +407,9 @@ int main(int argc, char **argv) } // Start writing statistics. - if (stats_thread != NULL) { + StatsThread *stats_thread = NULL; + if (!stats_file.empty()) { + stats_thread = new StatsThread(stats_file, stats_interval); stats_thread->run(); } @@ -342,37 +436,19 @@ int main(int argc, char **argv) if (stats_thread != NULL) { stats_thread->stop(); } - acceptor_thread.stop(); - - CubemapStateProto state; - state.set_serialize_start_sec(serialize_start.tv_sec); - state.set_serialize_start_usec(serialize_start.tv_usec); - state.set_server_sock(server_sock); - state.set_port(port); - + for (size_t i = 0; i < acceptors.size(); ++i) { + acceptors[i]->stop(); + } for (size_t i = 0; i < inputs.size(); ++i) { inputs[i]->stop(); - state.add_inputs()->MergeFrom(inputs[i]->serialize()); } - - for (int i = 0; i < num_servers; ++i) { - servers->get_server(i)->stop(); - - 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) { - state.mutable_streams()->MergeFrom(local_state.streams()); - } - for (int j = 0; j < local_state.clients_size(); ++j) { - state.add_clients()->MergeFrom(local_state.clients(j)); - } - } - delete servers; + servers->stop(); fprintf(stderr, "Serializing state and re-execing...\n"); - int state_fd = make_tempfile(state); - + int state_fd = make_tempfile(collect_state( + serialize_start, acceptors, inputs, servers, num_servers)); + delete servers; + char buf[16]; sprintf(buf, "%d", state_fd);