Enable RX support for kTLS.

[cubemap] / main.cpp

diff --git a/main.cpp b/main.cpp
index fc36861f64ab827d22b988f387e1a2b2e9cba75b..737f0c3573acea88fa7d9f0585aee69d95ec0838 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -15,6 +15,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
@@ -445,7 +446,7 @@ start:
                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.
@@ -520,7 +521,9 @@ start:
             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), short_response_pool);
@@ -529,6 +532,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.