X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=cubemap.cpp;h=9b98ebab999fe6e0818528305df992c92b378f7e;hp=ad218db29bcfb8985a5d70160886a6f9439f7c24;hb=300fecae0b66a632ffee1a291522d62c840a268c;hpb=1a09f42272356bc913d3503fe77a874baca3c387

diff --git a/cubemap.cpp b/cubemap.cpp
index ad218db..9b98eba 100644
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -15,8 +15,10 @@
 #include <vector>
 #include <string>
 #include <map>
+#include <set>
 
 #include "metacube.h"
+#include "parse.h"
 #include "server.h"
 #include "serverpool.h"
 #include "input.h"
@@ -77,7 +79,6 @@ int create_server_socket(int port)
 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);
@@ -101,7 +102,6 @@ void *acceptor_thread_run(void *arg)
 
 		// Pick a server, round-robin, and hand over the socket to it.
 		servers->add_client(sock);
-		++num_accepted;	
 	}
 }
 
@@ -171,120 +171,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;
-}
-
-// Note: Limits are inclusive.
-int fetch_config_int(const vector<ConfigLine> &config, const string &keyword, int min_limit, int max_limit)
-{
-	bool value_found = false;
-	int value = -1;
-	for (unsigned i = 0; i < config.size(); ++i) {
-		if (config[i].keyword != keyword) {
-			continue;
-		}
-		if (config[i].parameters.size() > 0 ||
-		    config[i].arguments.size() != 1) {
-			fprintf(stderr, "ERROR: '%s' takes one argument and no parameters\n", keyword.c_str());
-			exit(1);
-		}
-		value_found = true;
-		value = atoi(config[i].arguments[0].c_str());  // TODO: verify int validity.
-	}
-	if (!value_found) {
-		fprintf(stderr, "ERROR: Missing '%s' statement in config file.\n",
-			keyword.c_str());
-		exit(1);
-	}
-	if (value < min_limit || value > max_limit) {
-		fprintf(stderr, "ERROR: '%s' is set to %d, must be in [%d,%d]\n",
-			keyword.c_str(), value, min_limit, max_limit);
-		exit(1);
-	}
-	return value;
-}
-
 int main(int argc, char **argv)
 {
 	fprintf(stderr, "\nCubemap starting.\n");
@@ -298,6 +184,7 @@ int main(int argc, char **argv)
 	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]);
@@ -306,6 +193,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
@@ -319,9 +207,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.
@@ -339,9 +251,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);
 
@@ -349,7 +278,11 @@ 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 instead of using libcurl.
+	}
 
 	CubemapStateProto state;
 	state.set_server_sock(server_sock);