X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=1bcc07bd1e612573e85176749febdb204e9979f3;hp=692d48baf1d9e507d36926aa10a7f35f7d8847b1;hb=9b565a9e6e66f076abb7266b2c2f015f585fa9cb;hpb=f3e2d52ccf79454ee157917f9017263a8f4c50c3

diff --git a/cubemap.cpp b/cubemap.cpp
index 692d48b..1bcc07b 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -3,29 +3,38 @@
 #include <stdint.h>
 #include <assert.h>
 #include <arpa/inet.h>
-#include <curl/curl.h>
 #include <sys/socket.h>
 #include <pthread.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/epoll.h>
+#include <sys/poll.h>
+#include <signal.h>
 #include <errno.h>
+#include <ctype.h>
 #include <vector>
 #include <string>
 #include <map>
+#include <set>
 
 #include "metacube.h"
+#include "parse.h"
 #include "server.h"
+#include "serverpool.h"
 #include "input.h"
+#include "state.pb.h"
 
-#define NUM_SERVERS 4
 #define STREAM_ID "stream"
 #define STREAM_URL "http://gruessi.zrh.sesse.net:4013/"
-#define PORT 9094
 
 using namespace std;
 
-Server *servers = NULL;
+ServerPool *servers = NULL;
+volatile bool hupped = false;
+
+void hup(int ignored)
+{
+	hupped = true;
+}
 
 int create_server_socket(int port)
 {
@@ -48,6 +57,12 @@ int create_server_socket(int port)
 		exit(1);
 	}
 
+	// Set as non-blocking, so the acceptor thread can notice that we want to shut it down.
+	if (ioctl(server_sock, FIONBIO, &one) == -1) {
+		perror("ioctl(FIONBIO)");
+		exit(1);
+	}
+
 	sockaddr_in6 addr;
 	memset(&addr, 0, sizeof(addr));
 	addr.sin6_family = AF_INET6;
@@ -69,8 +84,23 @@ int create_server_socket(int port)
 void *acceptor_thread_run(void *arg)
 {
 	int server_sock = int(intptr_t(arg));
-	int num_accepted = 0;
-	for ( ;; ) {
+	while (!hupped) {
+		// Since we are non-blocking, we need to wait for the right state first.
+		// Wait up to 50 ms, then check hupped.
+		pollfd pfd;
+		pfd.fd = server_sock;
+		pfd.events = POLLIN;
+
+		int nfds = poll(&pfd, 1, 50);
+		if (nfds == 0 || (nfds == -1 && errno == EAGAIN)) {
+			continue;
+		}
+		if (nfds == -1) {
+			perror("poll");
+			usleep(100000);
+			continue;
+		}
+
 		sockaddr_in6 addr;
 		socklen_t addrlen = sizeof(addr);
 
@@ -81,7 +111,8 @@ void *acceptor_thread_run(void *arg)
 		}
 		if (sock == -1) {
 			perror("accept");
-			exit(1);
+			usleep(100000);
+			continue;
 		}
 
 		// Set the socket as nonblocking.
@@ -92,29 +123,253 @@ 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);
-		++num_accepted;	
+		servers->add_client(sock);
 	}
+	return NULL;
+}
+
+// Serialize the given state to a file descriptor, and return the (still open)
+// descriptor.
+int make_tempfile(const CubemapStateProto &state)
+{
+	char tmpl[] = "/tmp/cubemapstate.XXXXXX";
+	int state_fd = mkstemp(tmpl);
+	if (state_fd == -1) {
+		perror("mkstemp");
+		exit(1);
+	}
+
+	string serialized;
+	state.SerializeToString(&serialized);
+
+	const char *ptr = serialized.data();
+	size_t to_write = serialized.size();
+	while (to_write > 0) {
+		ssize_t ret = write(state_fd, ptr, to_write);
+		if (ret == -1) {
+			perror("write");
+			exit(1);
+		}
+
+		ptr += ret;
+		to_write -= ret;
+	}
+
+	return state_fd;
+}
+
+// Read the state back from the file descriptor made by make_tempfile,
+// and close it.
+CubemapStateProto read_tempfile(int state_fd)
+{
+	if (lseek(state_fd, 0, SEEK_SET) == -1) {
+		perror("lseek");
+		exit(1);
+	}
+
+	string serialized;
+	char buf[4096];
+	for ( ;; ) {
+		ssize_t ret = read(state_fd, buf, sizeof(buf));
+		if (ret == -1) {
+			perror("read");
+			exit(1);
+		}
+		if (ret == 0) {
+			// EOF.
+			break;
+		}
+
+		serialized.append(string(buf, buf + ret));
+	}
+
+	close(state_fd);  // Implicitly deletes the file.
+
+	CubemapStateProto state;
+	if (!state.ParseFromString(serialized)) {
+		fprintf(stderr, "PANIC: Failed deserialization of state.\n");
+		exit(1);
+	}
+
+	return state;
 }
 
 int main(int argc, char **argv)
 {
-	servers = new Server[NUM_SERVERS];
-	for (int i = 0; i < NUM_SERVERS; ++i) {
-		servers[i].add_stream(STREAM_ID);
-		servers[i].run();
+	fprintf(stderr, "\nCubemap starting.\n");
+
+	string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
+	vector<ConfigLine> config = parse_config(config_filename);
+
+	int port = fetch_config_int(config, "port", 1, 65535);
+	int num_servers = fetch_config_int(config, "num_servers", 1, 20000);  // Insanely high max limit.
+
+	servers = new ServerPool(num_servers);
+
+	int server_sock = -1, old_port = -1;
+	set<string> deserialized_stream_ids;
+	map<string, Input *> deserialized_inputs;
+	if (argc == 4 && strcmp(argv[2], "-state") == 0) {
+		fprintf(stderr, "Deserializing state from previous process... ");
+		int state_fd = atoi(argv[3]);
+		CubemapStateProto loaded_state = read_tempfile(state_fd);
+
+		// Deserialize the streams.
+		for (int i = 0; i < loaded_state.streams_size(); ++i) {
+			servers->add_stream_from_serialized(loaded_state.streams(i));
+			deserialized_stream_ids.insert(loaded_state.streams(i).stream_id());
+		}
+
+		// 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->add_client_from_serialized(loaded_state.clients(i));
+		}
+
+		// Deserialize the inputs. Note that we don't actually add them to any state yet.
+		for (int i = 0; i < loaded_state.inputs_size(); ++i) {
+			deserialized_inputs.insert(make_pair(
+				loaded_state.inputs(i).stream_id(),
+				new Input(loaded_state.inputs(i))));
+		} 
+
+		// Deserialize the server socket.
+		server_sock = loaded_state.server_sock();
+		old_port = loaded_state.port();
+
+		fprintf(stderr, "done.\n");
+	}
+
+	// Find all streams in the configuration file, and create them.
+	set<string> expecting_stream_ids = deserialized_stream_ids;
+	for (unsigned i = 0; i < config.size(); ++i) {
+		if (config[i].keyword != "stream") {
+			continue;
+		}
+		if (config[i].arguments.size() != 1) {
+			fprintf(stderr, "ERROR: 'stream' takes exactly one argument\n");
+			exit(1);
+		}
+		string stream_id = config[i].arguments[0];
+		if (deserialized_stream_ids.count(stream_id) == 0) {
+			servers->add_stream(stream_id);
+		}
+		expecting_stream_ids.erase(stream_id);
+	}
+
+	// Warn about any servers we've lost.
+	// TODO: Make an option (delete=yes?) to actually shut down streams.
+	for (set<string>::const_iterator stream_it = expecting_stream_ids.begin();
+	     stream_it != expecting_stream_ids.end();
+	     ++stream_it) {
+		string stream_id = *stream_it;
+		fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n",
+			stream_id.c_str());
+		fprintf(stderr, "         It will not be deleted, but clients will not get any new inputs.\n");
+		if (deserialized_inputs.count(stream_id) != 0) {
+			delete deserialized_inputs[stream_id];
+			deserialized_inputs.erase(stream_id);
+		}
+	}
+
+	// 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);
 	}
 
-	int 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));
 
-	Input input(STREAM_ID);
-	input.run(STREAM_URL);
+	// Find all streams in the configuration file, and create inputs for them.
+	vector<Input *> inputs;
+	for (unsigned i = 0; i < config.size(); ++i) {
+		if (config[i].keyword != "stream") {
+			continue;
+		}
+		assert(config[i].arguments.size() == 1);
+		string stream_id = config[i].arguments[0];
+
+		if (config[i].parameters.count("src") == 0) {
+			fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n",
+				stream_id.c_str());
+			continue;
+		}
+
+		string src = config[i].parameters["src"];
+		Input *input = NULL;
+		if (deserialized_inputs.count(stream_id) != 0) {
+			input = deserialized_inputs[stream_id];
+			if (input->get_url() != src) {
+				fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n",
+					stream_id.c_str(), input->get_url().c_str(), src.c_str());
+				delete input;
+				input = NULL;
+			}
+			deserialized_inputs.erase(stream_id);
+		}
+		if (input == NULL) {
+			input = new Input(stream_id, src);
+		}
+		input->run();
+		inputs.push_back(input);
+	}
+
+	// All deserialized inputs should now have been taken care of, one way or the other.
+	assert(deserialized_inputs.empty());
+
+	signal(SIGHUP, hup);
+
+	while (!hupped) {
+		usleep(100000);
+	}
+
+	// OK, we've been HUPed. Time to shut down everything, serialize, and re-exec.
+	if (pthread_join(acceptor_thread, NULL) == -1) {
+		perror("pthread_join");
+		exit(1);
+	}
+
+	CubemapStateProto state;
+	state.set_server_sock(server_sock);
+	state.set_port(port);
+
+	for (size_t i = 0; i < inputs.size(); ++i) {
+		inputs[i]->stop();
+		state.add_inputs()->MergeFrom(inputs[i]->serialize());
+	}
+
+	for (int i = 0; i < num_servers; ++i) {	
+		servers->get_server(i)->stop();
+
+		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));
+		}
+	}
+	delete servers;
 
-	for (int i = 0; i < NUM_SERVERS; ++i) {
-		servers[i].stop();
+	fprintf(stderr, "Serializing state and re-execing...\n");
+	int state_fd = make_tempfile(state);
+
+	char buf[16];
+	sprintf(buf, "%d", state_fd);
+
+	for ( ;; ) {
+		execlp(argv[0], argv[0], config_filename.c_str(), "-state", buf, NULL);
+		perror("execlp");
+		fprintf(stderr, "PANIC: re-exec of %s failed. Waiting 0.2 seconds and trying again...\n", argv[0]);
+		usleep(200000);
 	}
-	delete[] servers;
 }