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

diff --git a/cubemap.cpp b/cubemap.cpp
index 2bccac3..f682472 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -5,170 +5,361 @@
 #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 <signal.h>
+#include <errno.h>
+#include <ctype.h>
 #include <vector>
 #include <string>
 #include <map>
+
 #include "metacube.h"
+#include "server.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 BACKLOG_SIZE 1048576
 
 using namespace std;
 
-struct Client {
-	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA };
-	State state;
-
-	// The HTTP request, as sent by the client. If we are in READING_REQUEST,
-	// this might not be finished.
-	string client_request;
+Server *servers = NULL;
+volatile bool hupped = false;
 
-#if 0
-	// What stream we're connecting to; parsed from client_request.
-	// Not relevant for READING_REQUEST.
-	string stream_id;
-#endif
+void hup(int ignored)
+{
+	hupped = true;
+}
 
-	// Number of bytes we've sent of the header. Only relevant for SENDING_HEADER.
-	size_t header_bytes_sent;
+int create_server_socket(int port)
+{
+	int server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
+	if (server_sock == -1) {
+		perror("socket");
+		exit(1);
+	}
 
-	// Number of bytes we've sent of data. Only relevant for SENDING_DATA.
-	size_t bytes_sent;
-};
+	int one = 1;
+	if (setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) == -1) {
+		perror("setsockopt(SO_REUSEADDR)");
+		exit(1);
+	}
 
-struct Stream {
-	// The HTTP response header, plus the video stream header (if any).
-	string header;
+	// We want dual-stack sockets. (Sorry, OpenBSD and Windows XP...)
+	int zero = 0;
+	if (setsockopt(server_sock, IPPROTO_IPV6, IPV6_V6ONLY, &zero, sizeof(zero)) == -1) {
+		perror("setsockopt(IPV6_V6ONLY)");
+		exit(1);
+	}
 
-	// The stream data itself, stored in a circular buffer.
-	char data[BACKLOG_SIZE];
+	sockaddr_in6 addr;
+	memset(&addr, 0, sizeof(addr));
+	addr.sin6_family = AF_INET6;
+	addr.sin6_port = htons(port);
 
-	// How many bytes <data> contains. Can very well be larger than BACKLOG_SIZE,
-	// since the buffer wraps.
-	size_t data_size;
-};
+	if (bind(server_sock, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)) == -1) {
+		perror("bind");
+		exit(1);
+	}
 
-class Server {
-public:
-	void add_socket(int server_sock);
-	void add_stream(const string &stream_id);
-	void set_header(const string &stream_id, const string &header);
-	void add_data(const string &stream_id, const char *data, size_t bytes);
+	if (listen(server_sock, 128) == -1) {
+		perror("listen");
+		exit(1);
+	}
 
-private:
-	map<string, Stream> streams;
-};
+	return server_sock;
+}
 
-class Input {
-public:
-	Input();
-	void curl_callback(char *ptr, size_t bytes);
+void *acceptor_thread_run(void *arg)
+{
+	int server_sock = int(intptr_t(arg));
+	int num_accepted = 0;
+	for ( ;; ) {
+		sockaddr_in6 addr;
+		socklen_t addrlen = sizeof(addr);
 
-private:
-	void process_block(const char *data, uint32_t size, uint32_t flags);
-	void drop_pending_data(size_t num_bytes);
+		// Get a new socket.
+		int sock = accept(server_sock, reinterpret_cast<sockaddr *>(&addr), &addrlen);
+		if (sock == -1 && errno == EINTR) {
+			continue;
+		}
+		if (sock == -1) {
+			perror("accept");
+			exit(1);
+		}
 
-	// Data we have received but not fully processed yet.
-	vector<char> pending_data;
+		// Set the socket as nonblocking.
+		int one = 1;
+		if (ioctl(sock, FIONBIO, &one) == -1) {
+			perror("FIONBIO");
+			exit(1);
+		}
 
-	// If <pending_data> starts with a Metacube header,
-	// this is true.
-	bool has_metacube_header;
-};
+		// Pick a server, round-robin, and hand over the socket to it.
+		servers[num_accepted % NUM_SERVERS].add_client(sock);
+		++num_accepted;	
+	}
+}
 
-Input::Input()
-	: has_metacube_header(false)
+// 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;
 }
-	
-void Input::curl_callback(char *ptr, size_t bytes)
+
+// Read the state back from the file descriptor made by make_tempfile,
+// and close it.
+CubemapStateProto read_tempfile(int state_fd)
 {
-	pending_data.insert(pending_data.end(), ptr, ptr + bytes);
+	if (lseek(state_fd, 0, SEEK_SET) == -1) {
+		perror("lseek");
+		exit(1);
+	}
 
+	string serialized;
+	char buf[4096];
 	for ( ;; ) {
-		// If we don't have enough data (yet) for even the Metacube header, just return.
-		if (pending_data.size() < sizeof(metacube_block_header)) {
-			return;
-		}
-
-		// Make sure we have the Metacube sync header at the start.
-		// We may need to skip over junk data (it _should_ not happen, though).
-		if (!has_metacube_header) {
-			char *ptr = static_cast<char *>(
-				memmem(pending_data.data(), pending_data.size(),
-				       METACUBE_SYNC, strlen(METACUBE_SYNC)));
-			if (ptr == NULL) {
-				// OK, so we didn't find the sync marker. We know then that
-				// we do not have the _full_ marker in the buffer, but we
-				// could have N-1 bytes. Drop everything before that,
-				// and then give up.
-				drop_pending_data(pending_data.size() - (strlen(METACUBE_SYNC) - 1));
-				return;
-			} else {
-				// Yay, we found the header. Drop everything (if anything) before it.
-				drop_pending_data(ptr - pending_data.data());
-				has_metacube_header = true;
-
-				// Re-check that we have the entire header; we could have dropped data.
-				if (pending_data.size() < sizeof(metacube_block_header)) {
-					return;
-				}
-			}
+		ssize_t ret = read(state_fd, buf, sizeof(buf));
+		if (ret == -1) {
+			perror("read");
+			exit(1);
 		}
-
-		// Now it's safe to read the header.
-		metacube_block_header *hdr = reinterpret_cast<metacube_block_header *>(pending_data.data());	
-		assert(memcmp(hdr->sync, METACUBE_SYNC, sizeof(hdr->sync)) == 0);
-		uint32_t size = ntohl(hdr->size);
-		uint32_t flags = ntohl(hdr->flags);
-
-		// See if we have the entire block. If not, wait for more data.
-		if (pending_data.size() < sizeof(metacube_block_header) + size) {
-			return;
+		if (ret == 0) {
+			// EOF.
+			break;
 		}
 
-		process_block(pending_data.data(), size, flags);
+		serialized.append(string(buf, buf + ret));
+	}
+
+	close(state_fd);  // Implicitly deletes the file.
 
-		// Consume this block. This isn't the most efficient way of dealing with things
-		// should we have many blocks, but these routines don't need to be too efficient
-		// anyway.
-		pending_data.erase(pending_data.begin(), pending_data.begin() + sizeof(metacube_block_header) + size);
+	CubemapStateProto state;
+	if (!state.ParseFromString(serialized)) {
+		fprintf(stderr, "PANIC: Failed deserialization of state.\n");
+		exit(1);
 	}
+
+	return state;
 }
-		
-void Input::process_block(const char *data, uint32_t size, uint32_t flags)
-{
-	// TODO: treat it right here
-	printf("Block: %d bytes, flags=0x%x\n", size, flags);
-}
-			
-void Input::drop_pending_data(size_t num_bytes)
+
+// Split a line on whitespace, e.g. "foo  bar baz" -> {"foo", "bar", "baz"}.
+vector<string> split_tokens(const string &line)
 {
-	if (num_bytes == 0) {
-		return;
+	vector<string> ret;
+	string current_token;
+
+	for (size_t i = 0; i < line.size(); ++i) {
+		if (isspace(line[i])) {
+			if (!current_token.empty()) {
+				ret.push_back(current_token);
+			}
+			current_token.clear();
+		} else {
+			current_token.push_back(line[i]);
+		}
+	}
+	if (!current_token.empty()) {
+		ret.push_back(current_token);
 	}
-	fprintf(stderr, "Warning: Dropping %lld junk bytes from stream, maybe it is not a Metacube stream?\n",
-		(long long)num_bytes);
-	pending_data.erase(pending_data.begin(), pending_data.begin() + num_bytes);
+	return ret;
 }
 
-size_t curl_callback(char *ptr, size_t size, size_t nmemb, void *userdata)
+struct ConfigLine {
+	string keyword;
+	vector<string> arguments;
+	map<string, string> parameters;
+};
+
+// Parse the configuration file.
+vector<ConfigLine> parse_config(const string &filename)
 {
-	Input *input = static_cast<Input *>(userdata);
-	size_t bytes = size * nmemb;
-	input->curl_callback(ptr, bytes);	
-	return bytes;
+	vector<ConfigLine> ret;
+
+	FILE *fp = fopen(filename.c_str(), "r");
+	if (fp == NULL) {
+		perror(filename.c_str());
+		exit(1);
+	}
+
+	char buf[4096];
+	while (!feof(fp)) {
+		if (fgets(buf, sizeof(buf), fp) == NULL) {
+			break;
+		}
+
+		// Chop off the string at the first #, \r or \n.
+		buf[strcspn(buf, "#\r\n")] = 0;
+
+		// Remove all whitespace from the end of the string.
+		size_t len = strlen(buf);
+		while (len > 0 && isspace(buf[len - 1])) {
+			buf[--len] = 0;
+		}
+
+		// If the line is now all blank, ignore it.
+		if (len == 0) {
+			continue;
+		}
+
+		vector<string> tokens = split_tokens(buf);
+		assert(!tokens.empty());
+		
+		ConfigLine line;
+		line.keyword = tokens[0];
+
+		for (size_t i = 1; i < tokens.size(); ++i) {
+			// foo=bar is a parameter; anything else is an argument.
+			size_t equals_pos = tokens[i].find_first_of('=');
+			if (equals_pos == string::npos) {
+				line.arguments.push_back(tokens[i]);
+			} else {
+				string key = tokens[i].substr(0, equals_pos);
+				string value = tokens[i].substr(equals_pos + 1, string::npos);
+				line.parameters.insert(make_pair(key, value));
+			}
+		}
+
+		ret.push_back(line);
+	}
+
+	fclose(fp);
+	return ret;
 }
 
 int main(int argc, char **argv)
 {
-	Input input;
-	CURL *curl = curl_easy_init();
-	curl_easy_setopt(curl, CURLOPT_URL, "http://gruessi.zrh.sesse.net:4013/");
-	// curl_easy_setopt(curl, CURLOPT_URL, "http://www.google.com/");
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_callback);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &input);
-	curl_easy_perform(curl);
+	fprintf(stderr, "\nCubemap starting.\n");
+
+	string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
+	vector<ConfigLine> config = parse_config(config_filename);
+
+	// Go through each (parsed) configuration line.
+	int port = -1;
+	for (unsigned i = 0; i < config.size(); ++i) {
+		if (config[i].keyword == "port") {
+			if (config[i].parameters.size() > 0 ||
+			    config[i].arguments.size() != 1) {
+				fprintf(stderr, "ERROR: 'port' takes one argument and no parameters\n");
+				exit(1);
+			}
+			port = atoi(config[i].arguments[0].c_str());
+		}
+	}
+	if (port <= 0 || port > 65535) {
+		fprintf(stderr, "ERROR: Missing or invalid 'port' statement in config file\n");
+		exit(1);
+	}
+
+	// Create the servers.
+	servers = new Server[NUM_SERVERS];
+
+	int server_sock;
+	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) {
+			for (int j = 0; j < NUM_SERVERS; ++j) {
+				servers[j].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));
+		}
+
+		// Deserialize the server socket.
+		server_sock = loaded_state.server_sock();
+
+		fprintf(stderr, "done.\n");
+	} else {
+		server_sock = create_server_socket(port);
+
+		// TODO: This should come from the config file.
+		for (int i = 0; i < NUM_SERVERS; ++i) {
+			servers[i].add_stream(STREAM_ID);
+		}
+	}
+
+	for (int i = 0; i < NUM_SERVERS; ++i) {
+		servers[i].run();
+	}
+
+	pthread_t acceptor_thread;
+	pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
+
+	// TODO: This should come from the config file.
+	Input input(STREAM_ID, STREAM_URL);
+	input.run();
+
+	signal(SIGHUP, hup);
+
+	while (!hupped) {
+		usleep(100000);
+	}
+
+	input.stop();
+
+	CubemapStateProto state;
+	state.set_server_sock(server_sock);
+	for (int i = 0; i < NUM_SERVERS; ++i) {
+		servers[i].stop();
+
+		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));
+		}
+	}
+	delete[] servers;
+
+	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);
+	}
 }