X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=b471afb254adf483175d4ff631cc171275726797;hp=253ec3721734d9231e66a986adda2c4cdef9cb39;hb=fbfb955ee7233030357ec32c0d613f9279700d70;hpb=afbb7df7e933db2f4be2dbeab6bc90ef326785d9

diff --git a/cubemap.cpp b/cubemap.cpp
index 253ec37..b471afb 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -3,20 +3,21 @@
 #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"
@@ -56,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;
@@ -77,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);
 
@@ -89,7 +111,8 @@ void *acceptor_thread_run(void *arg)
 		}
 		if (sock == -1) {
 			perror("accept");
-			exit(1);
+			usleep(100000);
+			continue;
 		}
 
 		// Set the socket as nonblocking.
@@ -101,8 +124,8 @@ void *acceptor_thread_run(void *arg)
 
 		// Pick a server, round-robin, and hand over the socket to it.
 		servers->add_client(sock);
-		++num_accepted;	
 	}
+	return NULL;
 }
 
 // Serialize the given state to a file descriptor, and return the (still open)
@@ -171,90 +194,6 @@ CubemapStateProto read_tempfile(int state_fd)
 	return state;
 }
 
-// Split a line on whitespace, e.g. "foo  bar baz" -> {"foo", "bar", "baz"}.
-vector<string> split_tokens(const string &line)
-{
-	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);
-	}
-	return ret;
-}
-
-struct ConfigLine {
-	string keyword;
-	vector<string> arguments;
-	map<string, string> parameters;
-};
-
-// Parse the configuration file.
-vector<ConfigLine> parse_config(const string &filename)
-{
-	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)
 {
 	fprintf(stderr, "\nCubemap starting.\n");
@@ -262,38 +201,13 @@ int main(int argc, char **argv)
 	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, num_servers = -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 (config[i].keyword == "num_servers") {
-			if (config[i].parameters.size() > 0 ||
-			    config[i].arguments.size() != 1) {
-				fprintf(stderr, "ERROR: 'num_servers' takes one argument and no parameters\n");
-				exit(1);
-			}
-			num_servers = 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);
-	}
-	if (num_servers <= 0 || num_servers > 20000) {  // 20000 is an insanely high max limit.
-		fprintf(stderr, "ERROR: Missing or invalid 'num_servers' statement in config file\n");
-		exit(1);
-	}
+	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;
 	if (argc == 4 && strcmp(argv[2], "-state") == 0) {
 		fprintf(stderr, "Deserializing state from previous process... ");
 		int state_fd = atoi(argv[3]);
@@ -302,6 +216,7 @@ int main(int argc, char **argv)
 		// 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
@@ -315,9 +230,33 @@ int main(int argc, char **argv)
 		old_port = loaded_state.port();
 
 		fprintf(stderr, "done.\n");
-	} else{
-		// TODO: This should come from the config file.
-		servers->add_stream(STREAM_ID);
+	}
+
+	// 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) {
+		fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n",
+			stream_it->c_str());
+		fprintf(stderr, "         It will not be deleted, but clients will not get any new inputs.\n");
 	}
 
 	// Open a new server socket if we do not already have one, or if we changed ports.
@@ -335,9 +274,26 @@ int main(int argc, char **argv)
 	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();
+	// 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 = new Input(stream_id, src);
+		input->run();
+		inputs.push_back(input);
+	}
 
 	signal(SIGHUP, hup);
 
@@ -345,7 +301,16 @@ int main(int argc, char **argv)
 		usleep(100000);
 	}
 
-	input.stop();
+	// OK, we've been HUPed. Time to shut down everything, serialize, and re-exec.
+	for (size_t i = 0; i < inputs.size(); ++i) {
+		inputs[i]->stop();
+		delete inputs[i];  // TODO: Serialize.
+	}
+
+	if (pthread_join(acceptor_thread, NULL) == -1) {
+		perror("pthread_join");
+		exit(1);
+	}
 
 	CubemapStateProto state;
 	state.set_server_sock(server_sock);