X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=14f6323ae01cf1ca821adbcf9a93bfed43ab304d;hp=e953a8cea29d79da4579adb06a3580e989598a28;hb=0eac9253f23925734e256c63081e157c68c70704;hpb=4f4e1384b4299611924a39f59f536b4964806135 diff --git a/main.cpp b/main.cpp index e953a8c..14f6323 100644 --- a/main.cpp +++ b/main.cpp @@ -16,15 +16,17 @@ #include #include -#include "accesslog.h" #include "acceptor.h" +#include "accesslog.h" #include "config.h" #include "input.h" +#include "input_stats.h" #include "log.h" -#include "markpool.h" +#include "sa_compare.h" #include "serverpool.h" #include "state.pb.h" #include "stats.h" +#include "stream.h" #include "util.h" #include "version.h" @@ -32,10 +34,14 @@ using namespace std; AccessLogThread *access_log = NULL; ServerPool *servers = NULL; -vector mark_pools; volatile bool hupped = false; volatile bool stopped = false; +struct InputWithRefcount { + Input *input; + int refcount; +}; + void hup(int signum) { hupped = true; @@ -44,9 +50,13 @@ void hup(int signum) } } +void do_nothing(int signum) +{ +} + CubemapStateProto collect_state(const timeval &serialize_start, const vector acceptors, - const vector inputs, + const multimap inputs, ServerPool *servers) { CubemapStateProto state = servers->serialize(); // Fills streams() and clients(). @@ -57,8 +67,10 @@ CubemapStateProto collect_state(const timeval &serialize_start, state.add_acceptors()->MergeFrom(acceptors[i]->serialize()); } - for (size_t i = 0; i < inputs.size(); ++i) { - state.add_inputs()->MergeFrom(inputs[i]->serialize()); + for (multimap::const_iterator input_it = inputs.begin(); + input_it != inputs.end(); + ++input_it) { + state.add_inputs()->MergeFrom(input_it->second.input->serialize()); } return state; @@ -67,27 +79,28 @@ CubemapStateProto collect_state(const timeval &serialize_start, // Find all port statements in the configuration file, and create acceptors for htem. vector create_acceptors( const Config &config, - map *deserialized_acceptors) + map *deserialized_acceptors) { vector acceptors; for (unsigned i = 0; i < config.acceptors.size(); ++i) { const AcceptorConfig &acceptor_config = config.acceptors[i]; Acceptor *acceptor = NULL; - map::iterator deserialized_acceptor_it = - deserialized_acceptors->find(acceptor_config.port); + map::iterator deserialized_acceptor_it = + deserialized_acceptors->find(acceptor_config.addr); 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(acceptor_config.port, TCP_SOCKET); - acceptor = new Acceptor(server_sock, acceptor_config.port); + int server_sock = create_server_socket(acceptor_config.addr, TCP_SOCKET); + acceptor = new Acceptor(server_sock, acceptor_config.addr); } 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(); + for (map::iterator + acceptor_it = deserialized_acceptors->begin(); acceptor_it != deserialized_acceptors->end(); ++acceptor_it) { acceptor_it->second->close_socket(); @@ -97,85 +110,109 @@ vector create_acceptors( return acceptors; } +void create_config_input(const string &src, multimap *inputs) +{ + if (src.empty()) { + return; + } + if (inputs->count(src) != 0) { + return; + } + + InputWithRefcount iwr; + iwr.input = create_input(src); + if (iwr.input == NULL) { + log(ERROR, "did not understand URL '%s', clients will not get any data.", + src.c_str()); + return; + } + iwr.refcount = 0; + inputs->insert(make_pair(src, iwr)); +} + // Find all streams in the configuration file, and create inputs for them. -vector create_inputs(const Config &config, - map *deserialized_inputs) +void create_config_inputs(const Config &config, multimap *inputs) { - vector inputs; for (unsigned i = 0; i < config.streams.size(); ++i) { const StreamConfig &stream_config = config.streams[i]; - if (stream_config.src.empty()) { - continue; + if (stream_config.src != "delete") { + create_config_input(stream_config.src, inputs); } - - string stream_id = stream_config.stream_id; - string src = stream_config.src; - - 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) { - log(INFO, "Stream '%s' has changed URL from '%s' to '%s', restarting input.", - stream_id.c_str(), input->get_url().c_str(), src.c_str()); - input->close_socket(); - delete input; - input = NULL; - } - deserialized_inputs->erase(deserialized_input_it); - } - if (input == NULL) { - input = create_input(stream_id, src); - if (input == NULL) { - log(ERROR, "did not understand URL '%s', clients will not get any data.", - src.c_str()); - continue; - } - } - input->run(); - inputs.push_back(input); } - return inputs; + for (unsigned i = 0; i < config.udpstreams.size(); ++i) { + const UDPStreamConfig &udpstream_config = config.udpstreams[i]; + create_config_input(udpstream_config.src, inputs); + } } void create_streams(const Config &config, - const set &deserialized_stream_ids, - map *deserialized_inputs) + const set &deserialized_urls, + multimap *inputs) { - for (unsigned i = 0; i < config.mark_pools.size(); ++i) { - const MarkPoolConfig &mp_config = config.mark_pools[i]; - mark_pools.push_back(new MarkPool(mp_config.from, mp_config.to)); - } - - set expecting_stream_ids = deserialized_stream_ids; + // HTTP streams. + set expecting_urls = deserialized_urls; for (unsigned i = 0; i < config.streams.size(); ++i) { const StreamConfig &stream_config = config.streams[i]; - if (deserialized_stream_ids.count(stream_config.stream_id) == 0) { - servers->add_stream(stream_config.stream_id, stream_config.backlog_size); + int stream_index; + + expecting_urls.erase(stream_config.url); + + // Special-case deleted streams; they were never deserialized in the first place, + // so just ignore them. + if (stream_config.src == "delete") { + continue; + } + + if (deserialized_urls.count(stream_config.url) == 0) { + stream_index = servers->add_stream(stream_config.url, + stream_config.backlog_size, + Stream::Encoding(stream_config.encoding)); } else { - servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size); + stream_index = servers->lookup_stream_by_url(stream_config.url); + assert(stream_index != -1); + servers->set_backlog_size(stream_index, stream_config.backlog_size); + servers->set_encoding(stream_index, + Stream::Encoding(stream_config.encoding)); } - expecting_stream_ids.erase(stream_config.stream_id); - if (stream_config.mark_pool != -1) { - servers->set_mark_pool(stream_config.stream_id, - mark_pools[stream_config.mark_pool]); + servers->set_pacing_rate(stream_index, stream_config.pacing_rate); + + string src = stream_config.src; + if (!src.empty()) { + multimap::iterator input_it = inputs->find(src); + if (input_it != inputs->end()) { + input_it->second.input->add_destination(stream_index); + ++input_it->second.refcount; + } } } - // 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(); + // Warn about any streams servers we've lost. + for (set::const_iterator stream_it = expecting_urls.begin(); + stream_it != expecting_urls.end(); ++stream_it) { - string stream_id = *stream_it; + string url = *stream_it; log(WARNING, "stream '%s' disappeared from the configuration file. " - "It will not be deleted, but clients will not get any new inputs.", - stream_id.c_str()); - if (deserialized_inputs->count(stream_id) != 0) { - delete (*deserialized_inputs)[stream_id]; - deserialized_inputs->erase(stream_id); + "It will not be deleted, but clients will not get any new inputs. " + "If you really meant to delete it, set src=delete and reload.", + url.c_str()); + } + + // UDP streams. + for (unsigned i = 0; i < config.udpstreams.size(); ++i) { + const UDPStreamConfig &udpstream_config = config.udpstreams[i]; + int stream_index = servers->add_udpstream( + udpstream_config.dst, + udpstream_config.pacing_rate, + udpstream_config.ttl, + udpstream_config.multicast_iface_index); + + string src = udpstream_config.src; + if (!src.empty()) { + multimap::iterator input_it = inputs->find(src); + assert(input_it != inputs->end()); + input_it->second.input->add_destination(stream_index); + ++input_it->second.refcount; } } } @@ -235,10 +272,22 @@ bool dry_run_config(const std::string &argv0, const std::string &config_filename return (WIFEXITED(status) && WEXITSTATUS(status) == 0); } +void find_deleted_streams(const Config &config, set *deleted_urls) +{ + for (unsigned i = 0; i < config.streams.size(); ++i) { + const StreamConfig &stream_config = config.streams[i]; + if (stream_config.src == "delete") { + log(INFO, "Deleting stream '%s'.", stream_config.url.c_str()); + deleted_urls->insert(stream_config.url); + } + } +} + int main(int argc, char **argv) { signal(SIGHUP, hup); signal(SIGINT, hup); + signal(SIGUSR1, do_nothing); // Used in internal signalling. signal(SIGPIPE, SIG_IGN); // Parse options. @@ -278,7 +327,7 @@ int main(int argc, char **argv) char argv0_canon[PATH_MAX]; char config_filename_canon[PATH_MAX]; - if (realpath(argv[0], argv0_canon) == NULL) { + if (realpath("/proc/self/exe", argv0_canon) == NULL) { log_perror(argv[0]); exit(1); } @@ -321,15 +370,19 @@ start: servers = new ServerPool(config.num_servers); + // Find all the streams that are to be deleted. + set deleted_urls; + find_deleted_streams(config, &deleted_urls); + CubemapStateProto loaded_state; struct timeval serialize_start; - set deserialized_stream_ids; - map deserialized_inputs; - map deserialized_acceptors; + set deserialized_urls; + map deserialized_acceptors; + multimap inputs; // multimap due to older versions without deduplication. if (state_fd != -1) { log(INFO, "Deserializing state from previous process..."); string serialized; - if (!read_tempfile(state_fd, &serialized)) { + if (!read_tempfile_and_close(state_fd, &serialized)) { exit(1); } if (!loaded_state.ParseFromString(serialized)) { @@ -341,46 +394,83 @@ start: serialize_start.tv_usec = loaded_state.serialize_start_usec(); // Deserialize the streams. + map stream_headers_for_url; // See below. 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()); + const StreamProto &stream = loaded_state.streams(i); + + if (deleted_urls.count(stream.url()) != 0) { + // Delete the stream backlogs. + for (int j = 0; j < stream.data_fds_size(); ++j) { + safe_close(stream.data_fds(j)); + } + } else { + vector data_fds; + for (int j = 0; j < stream.data_fds_size(); ++j) { + data_fds.push_back(stream.data_fds(j)); + } + + servers->add_stream_from_serialized(stream, data_fds); + deserialized_urls.insert(stream.url()); + + stream_headers_for_url.insert(make_pair(stream.url(), stream.stream_header())); + } } - // Deserialize the inputs. Note that we don't actually add them to any state yet. + // Deserialize the inputs. Note that we don't actually add them to any stream 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)))); + InputProto serialized_input = loaded_state.inputs(i); + + InputWithRefcount iwr; + iwr.input = create_input(serialized_input); + iwr.refcount = 0; + inputs.insert(make_pair(serialized_input.url(), iwr)); } // Deserialize the acceptors. for (int i = 0; i < loaded_state.acceptors_size(); ++i) { + sockaddr_in6 sin6 = ExtractAddressFromAcceptorProto(loaded_state.acceptors(i)); deserialized_acceptors.insert(make_pair( - loaded_state.acceptors(i).port(), + sin6, new Acceptor(loaded_state.acceptors(i)))); } log(INFO, "Deserialization done."); } - // Find all streams in the configuration file, and create them. - create_streams(config, deserialized_stream_ids, &deserialized_inputs); - - vector acceptors = create_acceptors(config, &deserialized_acceptors); - vector inputs = create_inputs(config, &deserialized_inputs); + // Add any new inputs coming from the config. + create_config_inputs(config, &inputs); - // All deserialized inputs should now have been taken care of, one way or the other. - assert(deserialized_inputs.empty()); + // Find all streams in the configuration file, create them, and connect to the inputs. + create_streams(config, deserialized_urls, &inputs); + vector acceptors = create_acceptors(config, &deserialized_acceptors); // Put back the existing clients. It doesn't matter which server we - // allocate them to, so just do round-robin. However, we need to add - // them after the mark pools have been set up. + // allocate them to, so just do round-robin. for (int i = 0; i < loaded_state.clients_size(); ++i) { - servers->add_client_from_serialized(loaded_state.clients(i)); + if (deleted_urls.count(loaded_state.clients(i).url()) != 0) { + safe_close(loaded_state.clients(i).sock()); + } else { + servers->add_client_from_serialized(loaded_state.clients(i)); + } } servers->run(); + // Now delete all inputs that are longer in use, and start the others. + for (multimap::iterator input_it = inputs.begin(); + input_it != inputs.end(); ) { + if (input_it->second.refcount == 0) { + log(WARNING, "Input '%s' no longer in use, closing.", + input_it->first.c_str()); + input_it->second.input->close_socket(); + delete input_it->second.input; + inputs.erase(input_it++); + } else { + input_it->second.input->run(); + ++input_it; + } + } + // Start writing statistics. StatsThread *stats_thread = NULL; if (!config.stats_file.empty()) { @@ -388,6 +478,18 @@ start: stats_thread->run(); } + InputStatsThread *input_stats_thread = NULL; + if (!config.input_stats_file.empty()) { + vector inputs_no_refcount; + for (multimap::iterator input_it = inputs.begin(); + input_it != inputs.end(); ++input_it) { + inputs_no_refcount.push_back(input_it->second.input); + } + + input_stats_thread = new InputStatsThread(config.input_stats_file, config.input_stats_interval, inputs_no_refcount); + input_stats_thread->run(); + } + struct timeval server_start; gettimeofday(&server_start, NULL); if (state_fd != -1) { @@ -406,6 +508,10 @@ start: // OK, we've been HUPed. Time to shut down everything, serialize, and re-exec. gettimeofday(&serialize_start, NULL); + if (input_stats_thread != NULL) { + input_stats_thread->stop(); + delete input_stats_thread; + } if (stats_thread != NULL) { stats_thread->stop(); delete stats_thread; @@ -413,8 +519,10 @@ start: for (size_t i = 0; i < acceptors.size(); ++i) { acceptors[i]->stop(); } - for (size_t i = 0; i < inputs.size(); ++i) { - inputs[i]->stop(); + for (multimap::iterator input_it = inputs.begin(); + input_it != inputs.end(); + ++input_it) { + input_it->second.input->stop(); } servers->stop(); @@ -434,11 +542,6 @@ start: } delete servers; - for (unsigned i = 0; i < mark_pools.size(); ++i) { - delete mark_pools[i]; - } - mark_pools.clear(); - access_log->stop(); delete access_log; shut_down_logging();