Add support for deduplicating headers/short responses.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index 3e79b45ba41d065aa19021efe549eb1b65c08be6..8e233dafe8d9fb319bb29e09e6b4974b4ddedaad 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -16,27 +16,18 @@ using namespace std;
 
 ServerPool::ServerPool(int size)
        : servers(new Server[size]),
-         num_servers(size),
-         clients_added(0),
-         num_http_streams(0)
+         num_servers(size)
 {
 }
 
-ServerPool::~ServerPool()
-{
-       delete[] servers;
-
-       for (size_t i = 0; i < udp_streams.size(); ++i) {
-               delete udp_streams[i];
-       }
-}
-       
 CubemapStateProto ServerPool::serialize()
 {
        CubemapStateProto state;
 
+       unordered_map<const string *, size_t> short_response_pool;
+
        for (int i = 0; i < num_servers; ++i) {
-                CubemapStateProto local_state = servers[i].serialize();
+                CubemapStateProto local_state = servers[i].serialize(&short_response_pool);
 
                // The stream state should be identical between the servers, so we only store it once,
                // save for the fds, which we keep around to distribute to the servers after re-exec.
@@ -49,27 +40,34 @@ CubemapStateProto ServerPool::serialize()
                                state.mutable_streams(j)->add_data_fds(local_state.streams(j).data_fds(0));
                        }
                }
-               for (int j = 0; j < local_state.clients_size(); ++j) {
-                       state.add_clients()->MergeFrom(local_state.clients(j));
+               for (const ClientProto &client : local_state.clients()) {
+                       state.add_clients()->MergeFrom(client);
                }
         }
 
+       for (size_t i = 0; i < short_response_pool.size(); ++i) {
+               state.mutable_short_response_pool()->Add();
+       }
+       for (const auto &string_and_index : short_response_pool) {
+               state.mutable_short_response_pool(string_and_index.second)->set_header_or_short_response(*string_and_index.first);
+       }
+
        return state;
 }
 
-void ServerPool::add_client(int sock)
+void ServerPool::add_client(int sock, Acceptor *acceptor)
 {
-       servers[clients_added++ % num_servers].add_client_deferred(sock);
+       servers[clients_added++ % num_servers].add_client_deferred(sock, acceptor);
 }
 
-void ServerPool::add_client_from_serialized(const ClientProto &client)
+void ServerPool::add_client_from_serialized(const ClientProto &client, const std::vector<std::shared_ptr<const std::string>> &short_responses)
 {
-       servers[clients_added++ % num_servers].add_client_from_serialized(client);
+       servers[clients_added++ % num_servers].add_client_from_serialized(client, short_responses);
 }
 
 int ServerPool::lookup_stream_by_url(const string &url) const
 {
-       assert(servers != NULL);
+       assert(servers != nullptr);
        return servers[0].lookup_stream_by_url(url);
 }
 
@@ -123,7 +121,7 @@ int ServerPool::add_stream_from_serialized(const StreamProto &stream, const vect
        
 int ServerPool::add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl, int multicast_iface_index)
 {
-       udp_streams.push_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index));
+       udp_streams.emplace_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index));
        return num_http_streams + udp_streams.size() - 1;
 }
 
@@ -170,6 +168,13 @@ void ServerPool::add_gen204(const std::string &url, const std::string &allow_ori
        }
 }
 
+void ServerPool::create_tls_context_for_acceptor(const Acceptor *acceptor)
+{
+       for (int i = 0; i < num_servers; ++i) {
+               servers[i].create_tls_context_for_acceptor(acceptor);
+       }
+}
+
 void ServerPool::run()
 {
        for (int i = 0; i < num_servers; ++i) {