X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=8d60826fb3d7a8436607446f27b572ba294bc237;hp=064537cd79a0572ef706e66c52106ce522f8026d;hb=845934ca50eee40884e8cc85ea81eb310efa5ca3;hpb=9819131192eec224aa3aef48ef228604b6b098e5 diff --git a/main.cpp b/main.cpp index 064537c..8d60826 100644 --- a/main.cpp +++ b/main.cpp @@ -17,6 +17,7 @@ #include #include "acceptor.h" +#include "accesslog.h" #include "config.h" #include "input.h" #include "log.h" @@ -24,15 +25,23 @@ #include "serverpool.h" #include "state.pb.h" #include "stats.h" +#include "stream.h" #include "util.h" #include "version.h" 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; @@ -41,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(). @@ -54,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; @@ -94,86 +109,105 @@ 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; - } - - 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); + create_config_input(stream_config.src, inputs); + } + for (unsigned i = 0; i < config.udpstreams.size(); ++i) { + const UDPStreamConfig &udpstream_config = config.udpstreams[i]; + create_config_input(udpstream_config.src, inputs); } - return inputs; } void create_streams(const Config &config, - const set &deserialized_stream_ids, - map *deserialized_inputs) + const set &deserialized_urls, + multimap *inputs) { - vector mark_pools; // FIXME: leak 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; + 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); + expecting_urls.erase(stream_config.url); if (stream_config.mark_pool != -1) { - servers->set_mark_pool(stream_config.stream_id, - mark_pools[stream_config.mark_pool]); + servers->set_mark_pool(stream_index, mark_pools[stream_config.mark_pool]); + } + + string src = stream_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; } } - // Warn about any servers we've lost. + // Warn about any HTTP 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(); + 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); + url.c_str()); + } + + // UDP streams. + for (unsigned i = 0; i < config.udpstreams.size(); ++i) { + const UDPStreamConfig &udpstream_config = config.udpstreams[i]; + MarkPool *mark_pool = NULL; + if (udpstream_config.mark_pool != -1) { + mark_pool = mark_pools[udpstream_config.mark_pool]; + } + int stream_index = servers->add_udpstream(udpstream_config.dst, mark_pool); + + 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; } } } @@ -237,6 +271,7 @@ 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. @@ -246,9 +281,10 @@ int main(int argc, char **argv) static const option long_options[] = { { "state", required_argument, 0, 's' }, { "test-config", no_argument, 0, 't' }, + { 0, 0, 0, 0 } }; int option_index = 0; - int c = getopt_long (argc, argv, "s:t", long_options, &option_index); + int c = getopt_long(argc, argv, "s:t", long_options, &option_index); if (c == -1) { break; @@ -261,7 +297,8 @@ int main(int argc, char **argv) test_config = true; break; default: - assert(false); + fprintf(stderr, "Unknown option '%s'\n", argv[option_index]); + exit(1); } } @@ -275,11 +312,11 @@ int main(int argc, char **argv) char config_filename_canon[PATH_MAX]; if (realpath(argv[0], argv0_canon) == NULL) { - log_perror("realpath"); + log_perror(argv[0]); exit(1); } if (realpath(config_filename.c_str(), config_filename_canon) == NULL) { - log_perror("realpath"); + log_perror(config_filename.c_str()); exit(1); } @@ -307,13 +344,21 @@ start: open_logs(config.log_destinations); log(INFO, "Cubemap " SERVER_VERSION " starting."); + if (config.access_log_file.empty()) { + // Create a dummy logger. + access_log = new AccessLogThread(); + } else { + access_log = new AccessLogThread(config.access_log_file); + } + access_log->run(); + servers = new ServerPool(config.num_servers); CubemapStateProto loaded_state; struct timeval serialize_start; - set deserialized_stream_ids; - map deserialized_inputs; + 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; @@ -330,15 +375,29 @@ start: // 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()); + const StreamProto &stream = loaded_state.streams(i); + + vector data_fds; + for (int j = 0; j < stream.data_fds_size(); ++j) { + data_fds.push_back(stream.data_fds(j)); + } + + // Older versions stored the data once in the protobuf instead of + // sending around file descriptors. + if (data_fds.empty() && stream.has_data()) { + data_fds.push_back(make_tempfile(stream.data())); + } + + servers->add_stream_from_serialized(stream, data_fds); + deserialized_urls.insert(stream.url()); } - // 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)))); + InputWithRefcount iwr; + iwr.input = create_input(loaded_state.inputs(i)); + iwr.refcount = 0; + inputs.insert(make_pair(loaded_state.inputs(i).url(), iwr)); } // Deserialize the acceptors. @@ -351,14 +410,12 @@ start: 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 @@ -369,6 +426,21 @@ start: 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()) { @@ -396,12 +468,15 @@ start: if (stats_thread != NULL) { stats_thread->stop(); + delete stats_thread; } 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(); @@ -420,6 +495,14 @@ 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(); if (stopped) {