X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=db3be63f2d05a2cbcff27afa620205b97405f524;hp=79d98394eed49c56dc37b5a7812b039250f60233;hb=684496ba9c7def1421d045435b6b92e80bc54c74;hpb=156897c8a6c7b86cb244d74911528de5c28f2134 diff --git a/main.cpp b/main.cpp index 79d9839..db3be63 100644 --- a/main.cpp +++ b/main.cpp @@ -68,6 +68,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,6 +187,139 @@ MarkPool *parse_mark_pool(map, MarkPool *> *mark_pools, const str return get_mark_pool(mark_pools, from, to); } +// Find all port statements in the configuration file, and create acceptors for htem. +vector create_acceptors( + const vector &config, + map *deserialized_acceptors) +{ + 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; + } + + 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); + } + + // 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; + } + + return acceptors; +} + +// 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]; + + 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; + } + + 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 = new Input(stream_id, src); + } + input->run(); + inputs.push_back(input); + } + return inputs; +} + +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) { + 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); + + // Set up marks, if so desired. + 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); + } + } + + // 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) { + string stream_id = *stream_it; + 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); + } + } +} + int main(int argc, char **argv) { fprintf(stderr, "\nCubemap starting.\n"); @@ -164,15 +330,14 @@ int main(int argc, char **argv) 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); CubemapStateProto loaded_state; - int server_sock = -1, old_port = -1; set deserialized_stream_ids; map deserialized_inputs; + map deserialized_acceptors; if (argc == 4 && strcmp(argv[2], "-state") == 0) { is_reexec = true; @@ -196,61 +361,25 @@ int main(int argc, char **argv) new Input(loaded_state.inputs(i)))); } - // Deserialize the server socket. - server_sock = loaded_state.server_sock(); - old_port = loaded_state.port(); - - fprintf(stderr, "done.\n"); - } - - // Find all streams in the configuration file, and create them. - set expecting_stream_ids = deserialized_stream_ids; - map, MarkPool *> mark_pools; - for (unsigned i = 0; i < config.size(); ++i) { - if (config[i].keyword != "stream") { - continue; + // 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()); } - 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); - // Set up marks, if so desired. - if (config[i].parameters.count("mark")) { - MarkPool *mark_pool = parse_mark_pool(&mark_pools, config[i].parameters["mark"]); - servers->set_mark_pool(stream_id, mark_pool); + // 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)))); } - } - // 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) { - string stream_id = *stream_it; - 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); - } + fprintf(stderr, "done.\n"); } - // 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); - } + // 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); @@ -258,49 +387,14 @@ int main(int argc, char **argv) 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()); if (is_reexec) { // Put back the existing clients. It doesn't matter which server we @@ -311,11 +405,10 @@ int main(int argc, char **argv) } } - // All deserialized inputs should now have been taken care of, one way or the other. - assert(deserialized_inputs.empty()); - // 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 +435,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);