X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=88c49f4513bf60521fe782a387cddaf53999506c;hp=c208b2d19f381146df11e3322f86a4c34302862a;hb=061988af511f42da3cd584b4d983177504ddc177;hpb=26fe3ab755034ea3be8321ec0af548670f8c3bd8 diff --git a/main.cpp b/main.cpp index c208b2d..88c49f4 100644 --- a/main.cpp +++ b/main.cpp @@ -36,8 +36,8 @@ using namespace std; -AccessLogThread *access_log = NULL; -ServerPool *servers = NULL; +AccessLogThread *access_log = nullptr; +ServerPool *servers = nullptr; volatile bool hupped = false; volatile bool stopped = false; @@ -116,7 +116,7 @@ vector create_acceptors( { vector acceptors; for (const AcceptorConfig &acceptor_config : config.acceptors) { - Acceptor *acceptor = NULL; + Acceptor *acceptor = nullptr; const auto deserialized_acceptor_it = deserialized_acceptors->find(acceptor_config); if (deserialized_acceptor_it != deserialized_acceptors->end()) { acceptor = deserialized_acceptor_it->second; @@ -152,7 +152,7 @@ void create_config_input(const string &src, Input::Encoding encoding, multimap *inputs) { for (const StreamConfig &stream_config : config.streams) { - if (stream_config.src != "delete") { - create_config_input(stream_config.src, Input::Encoding(stream_config.src_encoding), inputs); + if (stream_config.src == "delete") { + // Ignored for pre-1.4.0 configuration compatibility. + continue; } + create_config_input(stream_config.src, Input::Encoding(stream_config.src_encoding), inputs); } for (const UDPStreamConfig &udpstream_config : config.udpstreams) { create_config_input(udpstream_config.src, Input::INPUT_ENCODING_RAW, inputs); @@ -185,9 +187,8 @@ void create_streams(const Config &config, 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") { + // Ignored for pre-1.4.0 configuration compatibility. continue; } @@ -282,7 +283,7 @@ bool dry_run_config(const string &argv0, const string &config_filename) return false; case 0: // Child. - execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, NULL); + execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, nullptr); log_perror(argv0_copy); _exit(1); default: @@ -307,12 +308,16 @@ bool dry_run_config(const string &argv0, const string &config_filename) return (WIFEXITED(status) && WEXITSTATUS(status) == 0); } -void find_deleted_streams(const Config &config, set *deleted_urls) +void find_all_streams(const Config &config, set *all_urls) { for (const StreamConfig &stream_config : config.streams) { if (stream_config.src == "delete") { - log(INFO, "Deleting stream '%s'.", stream_config.url.c_str()); - deleted_urls->insert(stream_config.url); + log(WARNING, "stream '%s' has src=delete; ignoring it. Since Cubemap 1.4.0, you do not " + "need to set src=delete to delete streams anymore; just delete them from " + "the configuration file.", + stream_config.url.c_str()); + } else { + all_urls->insert(stream_config.url); } } } @@ -363,11 +368,11 @@ int main(int argc, char **argv) char argv0_canon[PATH_MAX]; char config_filename_canon[PATH_MAX]; - if (realpath("/proc/self/exe", argv0_canon) == NULL) { + if (realpath("/proc/self/exe", argv0_canon) == nullptr) { log_perror(argv[0]); exit(1); } - if (realpath(config_filename.c_str(), config_filename_canon) == NULL) { + if (realpath(config_filename.c_str(), config_filename_canon) == nullptr) { log_perror(config_filename.c_str()); exit(1); } @@ -406,9 +411,9 @@ 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); + // Find all the streams that are to be kept. + set all_urls; + find_all_streams(config, &all_urls); CubemapStateProto loaded_state; timespec serialize_start; @@ -432,8 +437,9 @@ start: // Deserialize the streams. map stream_headers_for_url; // See below. for (const StreamProto &stream : loaded_state.streams()) { - if (deleted_urls.count(stream.url()) != 0) { + if (all_urls.count(stream.url()) == 0) { // Delete the stream backlogs. + log(INFO, "Deleting stream '%s'.", stream.url().c_str()); for (const int fd : stream.data_fds()) { safe_close(fd); } @@ -490,6 +496,12 @@ start: servers->create_tls_context_for_acceptor(acceptor); } } + + // Allocate strings for the short responses. + vector> short_response_pool; + for (const ShortResponsePool &str : loaded_state.short_response_pool()) { + short_response_pool.emplace_back(new string(str.header_or_short_response())); + } // Put back the existing clients. It doesn't matter which server we // allocate them to, so just do round-robin. However, we need to sort them @@ -498,13 +510,15 @@ start: loaded_state.mutable_clients()->end(), OrderByConnectionTime()); for (int i = 0; i < loaded_state.clients_size(); ++i) { - if (deleted_urls.count(loaded_state.clients(i).url()) != 0) { + if (all_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->add_client_from_serialized(loaded_state.clients(i), short_response_pool); } } + short_response_pool.clear(); // No longer needed; the clients have their own refcounts now. + servers->run(); // Now delete all inputs that are longer in use, and start the others. @@ -573,11 +587,11 @@ start: err = clock_gettime(CLOCK_MONOTONIC, &serialize_start); assert(err != -1); - if (input_stats_thread != NULL) { + if (input_stats_thread != nullptr) { input_stats_thread->stop(); input_stats_thread.reset(); } - if (stats_thread != NULL) { + if (stats_thread != nullptr) { stats_thread->stop(); stats_thread.reset(); } @@ -626,7 +640,7 @@ start: sprintf(buf, "%d", state_fd); for ( ;; ) { - execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, NULL); + execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, nullptr); open_logs(config.log_destinations); log_perror("execlp"); log(ERROR, "re-exec of %s failed. Waiting 0.2 seconds and trying again...", argv0_canon);