#include "metacube.h"
#include "server.h"
+#include "serverpool.h"
#include "input.h"
#include "state.pb.h"
using namespace std;
-Server *servers = NULL;
+ServerPool *servers = NULL;
volatile bool hupped = false;
void hup(int ignored)
}
// 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;
}
}
exit(1);
}
- // Create the servers.
- servers = new Server[NUM_SERVERS];
+ servers = new ServerPool(NUM_SERVERS);
int server_sock = -1, old_port = -1;
if (argc == 4 && strcmp(argv[2], "-state") == 0) {
// 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.
fprintf(stderr, "done.\n");
} 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);
}
// Open a new server socket if we do not already have one, or if we changed ports.
server_sock = create_server_socket(port);
}
- // Start up all the servers!
- for (int i = 0; i < NUM_SERVERS; ++i) {
- servers[i].run();
- }
+ servers->run();
pthread_t acceptor_thread;
pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
CubemapStateProto state;
state.set_server_sock(server_sock);
state.set_port(port);
- for (int i = 0; i < NUM_SERVERS; ++i) {
- servers[i].stop();
+ 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) {
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);