When closing unused inputs, remember to take down their sockets.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index e47c8d567da2f847b1f7d39301074232480fa7a8..60a913d56146ecf58f7f9b72b82af0bb7adeb1f5 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -1,3 +1,7 @@
+#include <google/protobuf/repeated_field.h>
+
+#include "client.h"
+#include "server.h"
 #include "serverpool.h"
 #include "state.pb.h"
 
@@ -44,10 +48,10 @@ void ServerPool::add_client_from_serialized(const ClientProto &client)
        servers[clients_added++ % num_servers].add_client_from_serialized(client);
 }
 
-void ServerPool::add_stream(const std::string &stream_id, size_t backlog_size)
+void ServerPool::add_stream(const string &stream_id, size_t backlog_size, Stream::Encoding encoding)
 {
        for (int i = 0; i < num_servers; ++i) {
-               servers[i].add_stream(stream_id, backlog_size);
+               servers[i].add_stream(stream_id, backlog_size, encoding);
        }
 }
 
@@ -58,14 +62,14 @@ void ServerPool::add_stream_from_serialized(const StreamProto &stream)
        }
 }
 
-void ServerPool::set_header(const std::string &stream_id, const std::string &header)
+void ServerPool::set_header(const string &stream_id, const string &http_header, const string &stream_header)
 {
        for (int i = 0; i < num_servers; ++i) {
-               servers[i].set_header(stream_id, header);
+               servers[i].set_header(stream_id, http_header, stream_header);
        }
 }
 
-void ServerPool::add_data(const std::string &stream_id, const char *data, size_t bytes)
+void ServerPool::add_data(const string &stream_id, const char *data, size_t bytes)
 {
        for (int i = 0; i < num_servers; ++i) {
                servers[i].add_data_deferred(stream_id, data, bytes);
@@ -96,9 +100,23 @@ vector<ClientStats> ServerPool::get_client_stats() const
        return ret;
 }
        
-void ServerPool::set_mark_pool(const std::string &stream_id, MarkPool *mark_pool)
+void ServerPool::set_mark_pool(const string &stream_id, MarkPool *mark_pool)
 {
        for (int i = 0; i < num_servers; ++i) {
                servers[i].set_mark_pool(stream_id, mark_pool);
        }       
 }
+
+void ServerPool::set_backlog_size(const string &stream_id, size_t new_size)
+{
+       for (int i = 0; i < num_servers; ++i) {
+               servers[i].set_backlog_size(stream_id, new_size);
+       }       
+}
+
+void ServerPool::set_encoding(const string &stream_id, Stream::Encoding encoding)
+{
+       for (int i = 0; i < num_servers; ++i) {
+               servers[i].set_encoding(stream_id, encoding);
+       }       
+}