X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=serverpool.cpp;h=352f7191f209a50630ede4c96a8aecb1ae33cd8a;hp=dc7506d3c975e73bff851f7208fb2984aa463086;hb=e666e2735bf831084d744027b844de9f4d3fe34d;hpb=019b96a9cc6fa2902690e98a2aa033517efef3ed

diff --git a/serverpool.cpp b/serverpool.cpp
index dc7506d..352f719 100644
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -1,4 +1,9 @@
+#include <google/protobuf/repeated_field.h>
+
+#include "client.h"
+#include "server.h"
 #include "serverpool.h"
+#include "state.pb.h"
 
 using namespace std;
 
@@ -13,6 +18,25 @@ ServerPool::~ServerPool()
 {
 	delete[] servers;
 }
+	
+CubemapStateProto ServerPool::serialize()
+{
+	CubemapStateProto state;
+
+	for (int i = 0; i < num_servers; ++i) {
+                CubemapStateProto local_state = servers[i].serialize();
+
+		// The stream state should be identical between the servers, so we only store it once.
+		if (i == 0) {
+			state.mutable_streams()->MergeFrom(local_state.streams());
+		}
+		for (int j = 0; j < local_state.clients_size(); ++j) {
+			state.add_clients()->MergeFrom(local_state.clients(j));
+		}
+        }
+
+	return state;
+}
 
 void ServerPool::add_client(int sock)
 {
@@ -24,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)
+void ServerPool::add_stream(const std::string &stream_id, size_t backlog_size)
 {
 	for (int i = 0; i < num_servers; ++i) {
-		servers[i].add_stream(stream_id);
+		servers[i].add_stream(stream_id, backlog_size);
 	}
 }
 
@@ -59,6 +83,13 @@ void ServerPool::run()
 	}
 }
 	
+void ServerPool::stop()
+{
+	for (int i = 0; i < num_servers; ++i) {
+		servers[i].stop();
+	}
+}
+	
 vector<ClientStats> ServerPool::get_client_stats() const
 {
 	vector<ClientStats> ret;
@@ -68,3 +99,17 @@ vector<ClientStats> ServerPool::get_client_stats() const
 	}
 	return ret;
 }
+	
+void ServerPool::set_mark_pool(const std::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 std::string &stream_id, size_t new_size)
+{
+	for (int i = 0; i < num_servers; ++i) {
+		servers[i].set_backlog_size(stream_id, new_size);
+	}	
+}