X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=50fd48e729f1df4c47b30755e017b9f2d2c1a0d8;hp=058935d523165a5c7ff62479147329f17ec38037;hb=HEAD;hpb=49851eb86428de7a76b00ea4067cdf32c28e7397

diff --git a/main.cpp b/main.cpp
index 058935d..50fd48e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <getopt.h>
 #include <limits.h>
 #include <signal.h>
@@ -532,6 +533,15 @@ start:
 	
 	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.
@@ -613,6 +623,9 @@ start:
 	}
 	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();
 
@@ -652,6 +665,10 @@ start:
 	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);