X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=4f03feae49f5073abc4d8f66bde35cd4632d8146;hp=f6824723e9f6ed8afe86eee9933a3d361ec24c67;hb=b59fa7ce2d47f135ea027548cc89f937a5fa875b;hpb=8a8543b685b010c9f7653430e2790e15779657d7

diff --git a/cubemap.cpp b/cubemap.cpp
index f682472..4f03fea 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -18,6 +18,7 @@
 
 #include "metacube.h"
 #include "server.h"
+#include "serverpool.h"
 #include "input.h"
 #include "state.pb.h"
 
@@ -27,7 +28,7 @@
 
 using namespace std;
 
-Server *servers = NULL;
+ServerPool *servers = NULL;
 volatile bool hupped = false;
 
 void hup(int ignored)
@@ -100,7 +101,7 @@ void *acceptor_thread_run(void *arg)
 		}
 
 		// Pick a server, round-robin, and hand over the socket to it.
-		servers[num_accepted % NUM_SERVERS].add_client(sock);
+		servers->add_client(sock);
 		++num_accepted;	
 	}
 }
@@ -279,10 +280,9 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	// Create the servers.
-	servers = new Server[NUM_SERVERS];
+	servers = new ServerPool(NUM_SERVERS);
 
-	int server_sock;
+	int server_sock = -1, old_port = -1;
 	if (argc == 4 && strcmp(argv[2], "-state") == 0) {
 		fprintf(stderr, "Deserializing state from previous process... ");
 		int state_fd = atoi(argv[3]);
@@ -290,33 +290,36 @@ int main(int argc, char **argv)
 
 		// Deserialize the streams.
 		for (int i = 0; i < loaded_state.streams_size(); ++i) {
-			for (int j = 0; j < NUM_SERVERS; ++j) {
-				servers[j].add_stream_from_serialized(loaded_state.streams(i));
-			}
+			servers->add_stream_from_serialized(loaded_state.streams(i));
 		}
 
 		// Put back the existing clients. It doesn't matter which server we
 		// allocate them to, so just do round-robin.
 		for (int i = 0; i < loaded_state.clients_size(); ++i) {
-			servers[i % NUM_SERVERS].add_client_from_serialized(loaded_state.clients(i));
+			servers->add_client_from_serialized(loaded_state.clients(i));
 		}
 
 		// Deserialize the server socket.
 		server_sock = loaded_state.server_sock();
+		old_port = loaded_state.port();
 
 		fprintf(stderr, "done.\n");
-	} else {
-		server_sock = create_server_socket(port);
-
+	} else{
 		// TODO: This should come from the config file.
-		for (int i = 0; i < NUM_SERVERS; ++i) {
-			servers[i].add_stream(STREAM_ID);
-		}
+		servers->add_stream(STREAM_ID);
 	}
 
-	for (int i = 0; i < NUM_SERVERS; ++i) {
-		servers[i].run();
+	// Open a new server socket if we do not already have one, or if we changed ports.
+	if (server_sock != -1 && port != old_port) {
+		fprintf(stderr, "NOTE: Port changed from %d to %d; opening new socket.\n", old_port, port);
+		close(server_sock);
+		server_sock = -1;
 	}
+	if (server_sock == -1) {
+		server_sock = create_server_socket(port);
+	}
+
+	servers->run();
 
 	pthread_t acceptor_thread;
 	pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
@@ -335,10 +338,11 @@ int main(int argc, char **argv)
 
 	CubemapStateProto state;
 	state.set_server_sock(server_sock);
-	for (int i = 0; i < NUM_SERVERS; ++i) {
-		servers[i].stop();
+	state.set_port(port);
+	for (int i = 0; i < NUM_SERVERS; ++i) {	
+		servers->get_server(i)->stop();
 
-		CubemapStateProto local_state = servers[i].serialize();
+		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) {
@@ -348,7 +352,7 @@ int main(int argc, char **argv)
 			state.add_clients()->MergeFrom(local_state.clients(j));
 		}
 	}
-	delete[] servers;
+	delete servers;
 
 	fprintf(stderr, "Serializing state and re-execing...\n");
 	int state_fd = make_tempfile(state);