#include <assert.h>
#include <errno.h>
+#include <fcntl.h>
#include <getopt.h>
#include <limits.h>
#include <signal.h>
#include <map>
#include <set>
#include <string>
+#include <unordered_map>
#include <utility>
#include <vector>
if (deserialized_urls.count(stream_config.url) == 0) {
stream_index = servers->add_stream(stream_config.url,
+ stream_config.hls_url,
stream_config.backlog_size,
stream_config.prebuffering_bytes,
Stream::Encoding(stream_config.encoding),
- Stream::Encoding(stream_config.src_encoding));
+ Stream::Encoding(stream_config.src_encoding),
+ stream_config.hls_frag_duration,
+ stream_config.hls_backlog_margin,
+ stream_config.allow_origin);
} else {
stream_index = servers->lookup_stream_by_url(stream_config.url);
assert(stream_index != -1);
servers->set_backlog_size(stream_index, stream_config.backlog_size);
+ if (!stream_config.hls_url.empty()) {
+ servers->register_hls_url(stream_index, stream_config.hls_url);
+ }
servers->set_prebuffering_bytes(stream_index, stream_config.prebuffering_bytes);
servers->set_encoding(stream_index,
Stream::Encoding(stream_config.encoding));
servers->set_src_encoding(stream_index,
Stream::Encoding(stream_config.src_encoding));
+ servers->set_hls_frag_duration(stream_index, stream_config.hls_frag_duration);
+ servers->set_hls_backlog_margin(stream_index, stream_config.hls_backlog_margin);
+ servers->set_allow_origin(stream_index, stream_config.allow_origin);
}
servers->set_pacing_rate(stream_index, stream_config.pacing_rate);
serialize_start.tv_nsec = loaded_state.serialize_start_usec() * 1000ull;
// Deserialize the streams.
- map<string, string> stream_headers_for_url; // See below.
+ unordered_map<string, string> stream_headers_for_url; // See below.
for (const StreamProto &stream : loaded_state.streams()) {
if (all_urls.count(stream.url()) == 0) {
// Delete the stream backlogs.
servers->create_tls_context_for_acceptor(acceptor);
}
}
+
+ // Allocate strings for the short responses.
+ vector<shared_ptr<const string>> 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
loaded_state.mutable_clients()->end(),
OrderByConnectionTime());
for (int i = 0; i < loaded_state.clients_size(); ++i) {
- if (all_urls.count(loaded_state.clients(i).url()) == 0) {
+ if (!loaded_state.clients(i).url().empty() &&
+ all_urls.count(loaded_state.clients(i).url()) == 0) {
+ // Belongs to a dead stream (not keepalive), so we just have to close.
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.
+
+ // Put back the HLS zombies. There's no really good allocation here
+ // except round-robin; it would be marginally more efficient to match it
+ // to the client (since that would have them deleted immediately when
+ // the client requests the next fragment, instead of being later weeded
+ // out during statistics collection), but it's not a big deal.
+ for (const HLSZombieProto &zombie_proto : loaded_state.hls_zombies()) {
+ servers->add_hls_zombie_from_serialized(zombie_proto);
+ }
+
servers->run();
// Now delete all inputs that are longer in use, and start the others.
}
for (const auto &key_and_input_with_refcount : inputs) {
key_and_input_with_refcount.second.input->stop();
+ if (stopped) {
+ key_and_input_with_refcount.second.input->close_socket();
+ }
}
servers->stop();
char buf[16];
sprintf(buf, "%d", state_fd);
+ // Unset the close-on-exec flag for the state fd.
+ // (This can't leak into a child, since there's only one thread left.)
+ fcntl(state_fd, F_SETFD, 0);
+
for ( ;; ) {
execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, nullptr);
open_logs(config.log_destinations);