X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=main.cpp;h=eed486ebe39889dacac191aa7a0d9fc3a6c8a322;hb=ce95fbe3011d2e5be2da737b05bca9af8db8a646;hp=c5640e0c6ecd6c70fadad8c748a1907dfbf565fe;hpb=2c6cd9718a5baf5a2ed5be73ec3c525d4873f45a;p=cubemap

diff --git a/main.cpp b/main.cpp
index c5640e0..eed486e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -73,10 +73,9 @@ int make_tempfile(const CubemapStateProto &state)
 CubemapStateProto collect_state(const timeval &serialize_start,
                                 const vector<Acceptor *> acceptors,
                                 const vector<Input *> inputs,
-                                ServerPool *servers,
-                                int num_servers)
+                                ServerPool *servers)
 {
-	CubemapStateProto state;
+	CubemapStateProto state = servers->serialize();  // Fills streams() and clients().
 	state.set_serialize_start_sec(serialize_start.tv_sec);
 	state.set_serialize_start_usec(serialize_start.tv_usec);
 	
@@ -88,18 +87,6 @@ CubemapStateProto collect_state(const timeval &serialize_start,
 		state.add_inputs()->MergeFrom(inputs[i]->serialize());
 	}
 
-	for (int i = 0; i < num_servers; ++i) {	
-		CubemapStateProto local_state = servers->get_server(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;
 }
 
@@ -375,7 +362,7 @@ int main(int argc, char **argv)
 
 	fprintf(stderr, "Serializing state and re-execing...\n");
 	int state_fd = make_tempfile(collect_state(
-		serialize_start, acceptors, inputs, servers, config.num_servers));
+		serialize_start, acceptors, inputs, servers));
 	delete servers;
 	 
 	char buf[16];