X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=889b737fcbe3c08d3983e00677b37cc5aff8aa7d;hp=1300508f314dc7b5909e6567c80832ac01432345;hb=07569f8e011cd9b064c64bef1ce56f77bf7ddf53;hpb=462cb16514a2b691ae4d4b76125b42fda83df712

diff --git a/main.cpp b/main.cpp
index 1300508..889b737 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,483 +1,504 @@
+#include <assert.h>
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <signal.h>
+#include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include <assert.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
 #include <sys/time.h>
-#include <signal.h>
-#include <errno.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <vector>
-#include <string>
+#include <sys/wait.h>
+#include <unistd.h>
 #include <map>
 #include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "markpool.h"
-#include "metacube.h"
-#include "parse.h"
-#include "server.h"
-#include "serverpool.h"
+#include "acceptor.h"
+#include "accesslog.h"
+#include "config.h"
 #include "input.h"
+#include "input_stats.h"
+#include "log.h"
+#include "sa_compare.h"
+#include "serverpool.h"
 #include "state.pb.h"
+#include "stats.h"
+#include "stream.h"
+#include "util.h"
+#include "version.h"
 
 using namespace std;
 
+AccessLogThread *access_log = NULL;
 ServerPool *servers = NULL;
 volatile bool hupped = false;
+volatile bool stopped = false;
+
+struct InputWithRefcount {
+	Input *input;
+	int refcount;
+};
 
-void hup(int ignored)
+void hup(int signum)
 {
 	hupped = true;
+	if (signum == SIGINT) {
+		stopped = true;
+	}
 }
 
-int create_server_socket(int port)
+void do_nothing(int signum)
 {
-	int server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
-	if (server_sock == -1) {
-		perror("socket");
-		exit(1);
+}
+
+CubemapStateProto collect_state(const timeval &serialize_start,
+                                const vector<Acceptor *> acceptors,
+                                const multimap<string, InputWithRefcount> inputs,
+                                ServerPool *servers)
+{
+	CubemapStateProto state = servers->serialize();  // Fills streams() and clients().
+	state.set_serialize_start_sec(serialize_start.tv_sec);
+	state.set_serialize_start_usec(serialize_start.tv_usec);
+	
+	for (size_t i = 0; i < acceptors.size(); ++i) {
+		state.add_acceptors()->MergeFrom(acceptors[i]->serialize());
 	}
 
-	int one = 1;
-	if (setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) == -1) {
-		perror("setsockopt(SO_REUSEADDR)");
-		exit(1);
+	for (multimap<string, InputWithRefcount>::const_iterator input_it = inputs.begin();
+	     input_it != inputs.end();
+	     ++input_it) {
+		state.add_inputs()->MergeFrom(input_it->second.input->serialize());
 	}
 
-	// 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);
+	return state;
+}
+
+// Find all port statements in the configuration file, and create acceptors for htem.
+vector<Acceptor *> create_acceptors(
+	const Config &config,
+	map<sockaddr_in6, Acceptor *, Sockaddr6Compare> *deserialized_acceptors)
+{
+	vector<Acceptor *> acceptors;
+	for (unsigned i = 0; i < config.acceptors.size(); ++i) {
+		const AcceptorConfig &acceptor_config = config.acceptors[i];
+		Acceptor *acceptor = NULL;
+		map<sockaddr_in6, Acceptor *, Sockaddr6Compare>::iterator deserialized_acceptor_it =
+			deserialized_acceptors->find(acceptor_config.addr);
+		if (deserialized_acceptor_it != deserialized_acceptors->end()) {
+			acceptor = deserialized_acceptor_it->second;
+			deserialized_acceptors->erase(deserialized_acceptor_it);
+		} else {
+			int server_sock = create_server_socket(acceptor_config.addr, TCP_SOCKET);
+			acceptor = new Acceptor(server_sock, acceptor_config.addr);
+		}
+		acceptor->run();
+		acceptors.push_back(acceptor);
 	}
 
-	// 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);
+	// Close all acceptors that are no longer in the configuration file.
+	for (map<sockaddr_in6, Acceptor *, Sockaddr6Compare>::iterator
+	         acceptor_it = deserialized_acceptors->begin();
+	     acceptor_it != deserialized_acceptors->end();
+	     ++acceptor_it) {
+		acceptor_it->second->close_socket();
+		delete acceptor_it->second;
 	}
 
-	sockaddr_in6 addr;
-	memset(&addr, 0, sizeof(addr));
-	addr.sin6_family = AF_INET6;
-	addr.sin6_port = htons(port);
+	return acceptors;
+}
 
-	if (bind(server_sock, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)) == -1) {
-		perror("bind");
-		exit(1);
+void create_config_input(const string &src, multimap<string, InputWithRefcount> *inputs)
+{
+	if (src.empty()) {
+		return;
 	}
-
-	if (listen(server_sock, 128) == -1) {
-		perror("listen");
-		exit(1);
+	if (inputs->count(src) != 0) {
+		return;
 	}
 
-	return server_sock;
+	InputWithRefcount iwr;
+	iwr.input = create_input(src);
+	if (iwr.input == NULL) {
+		log(ERROR, "did not understand URL '%s', clients will not get any data.",
+			src.c_str());
+		return;
+	}
+	iwr.refcount = 0;
+	inputs->insert(make_pair(src, iwr));
 }
 
-void *acceptor_thread_run(void *arg)
+// Find all streams in the configuration file, and create inputs for them.
+void create_config_inputs(const Config &config, multimap<string, InputWithRefcount> *inputs)
 {
-	int server_sock = int(intptr_t(arg));
-	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 == EINTR)) {
-			continue;
-		}
-		if (nfds == -1) {
-			perror("poll");
-			usleep(100000);
-			continue;
+	for (unsigned i = 0; i < config.streams.size(); ++i) {
+		const StreamConfig &stream_config = config.streams[i];
+		if (stream_config.src != "delete") {
+			create_config_input(stream_config.src, inputs);
 		}
+	}
+	for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
+		const UDPStreamConfig &udpstream_config = config.udpstreams[i];
+		create_config_input(udpstream_config.src, inputs);
+	}
+}
 
-		sockaddr_in6 addr;
-		socklen_t addrlen = sizeof(addr);
+void create_streams(const Config &config,
+                    const set<string> &deserialized_urls,
+                    multimap<string, InputWithRefcount> *inputs)
+{
+	// HTTP streams.
+	set<string> expecting_urls = deserialized_urls;
+	for (unsigned i = 0; i < config.streams.size(); ++i) {
+		const StreamConfig &stream_config = config.streams[i];
+		int stream_index;
 
-		// 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");
-			usleep(100000);
+		expecting_urls.erase(stream_config.url);
+
+		// Special-case deleted streams; they were never deserialized in the first place,
+		// so just ignore them.
+		if (stream_config.src == "delete") {
 			continue;
 		}
 
-		// Set the socket as nonblocking.
-		int one = 1;
-		if (ioctl(sock, FIONBIO, &one) == -1) {
-			perror("FIONBIO");
-			exit(1);
+		if (deserialized_urls.count(stream_config.url) == 0) {
+			stream_index = servers->add_stream(stream_config.url,
+			                                   stream_config.backlog_size,
+			                                   Stream::Encoding(stream_config.encoding));
+		} else {
+			stream_index = servers->lookup_stream_by_url(stream_config.url);
+			assert(stream_index != -1);
+			servers->set_backlog_size(stream_index, stream_config.backlog_size);
+			servers->set_encoding(stream_index,
+			                      Stream::Encoding(stream_config.encoding));
 		}
 
-		// Pick a server, round-robin, and hand over the socket to it.
-		servers->add_client(sock);
-	}
-	return NULL;
-}
+		servers->set_pacing_rate(stream_index, stream_config.pacing_rate);
 
-struct StatsThreadParameters {
-	string stats_file;
-	int stats_interval;
-};
-		
-void *stats_thread_run(void *arg)
-{
-	const StatsThreadParameters *parms = reinterpret_cast<StatsThreadParameters *>(arg);
-	while (!hupped) {
-		int fd;
-		FILE *fp;
-		time_t now;
-		vector<ClientStats> client_stats;
-
-		// Open a new, temporary file.
-		char *filename = strdup((parms->stats_file + ".new.XXXXXX").c_str());
-		fd = mkostemp(filename, O_WRONLY);
-		if (fd == -1) {
-			perror(filename);
-			free(filename);
-			goto sleep;
+		string src = stream_config.src;
+		if (!src.empty()) {
+			multimap<string, InputWithRefcount>::iterator input_it = inputs->find(src);
+			if (input_it != inputs->end()) {
+				input_it->second.input->add_destination(stream_index);
+				++input_it->second.refcount;
+			}
 		}
+	}
 
-		fp = fdopen(fd, "w");
-		if (fp == NULL) {
-			perror("fdopen");
-			close(fd);
-			unlink(filename);
-			free(filename);
-			goto sleep;
-		}
+	// Warn about any streams servers we've lost.
+	for (set<string>::const_iterator stream_it = expecting_urls.begin();
+	     stream_it != expecting_urls.end();
+	     ++stream_it) {
+		string url = *stream_it;
+		log(WARNING, "stream '%s' disappeared from the configuration file. "
+		             "It will not be deleted, but clients will not get any new inputs. "
+		             "If you really meant to delete it, set src=delete and reload.",
+		             url.c_str());
+	}
 
-		now = time(NULL);
-		client_stats = servers->get_client_stats();
-		for (size_t i = 0; i < client_stats.size(); ++i) {
-			fprintf(fp, "%s %s %d %llu\n",
-			        client_stats[i].remote_addr.c_str(),
-				client_stats[i].stream_id.c_str(),
-				int(now - client_stats[i].connect_time),
-				(long long unsigned)(client_stats[i].bytes_sent));
-		}
-		if (fclose(fp) == EOF) {
-			perror("fclose");
-			unlink(filename);
-			free(filename);
-			goto sleep;
+	// UDP streams.
+	for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
+		const UDPStreamConfig &udpstream_config = config.udpstreams[i];
+		int stream_index = servers->add_udpstream(
+			udpstream_config.dst,
+			udpstream_config.pacing_rate,
+			udpstream_config.ttl,
+			udpstream_config.multicast_iface_index);
+
+		string src = udpstream_config.src;
+		if (!src.empty()) {
+			multimap<string, InputWithRefcount>::iterator input_it = inputs->find(src);
+			assert(input_it != inputs->end());
+			input_it->second.input->add_destination(stream_index);
+			++input_it->second.refcount;
 		}
-		
-		if (rename(filename, parms->stats_file.c_str()) == -1) {
-			perror("rename");
-			unlink(filename);
+	}
+}
+	
+void open_logs(const vector<LogConfig> &log_destinations)
+{
+	for (size_t i = 0; i < log_destinations.size(); ++i) {
+		if (log_destinations[i].type == LogConfig::LOG_TYPE_FILE) {
+			add_log_destination_file(log_destinations[i].filename);
+		} else if (log_destinations[i].type == LogConfig::LOG_TYPE_CONSOLE) {
+			add_log_destination_console();
+		} else if (log_destinations[i].type == LogConfig::LOG_TYPE_SYSLOG) {
+			add_log_destination_syslog();
+		} else {
+			assert(false);
 		}
-
-sleep:
-		int left_to_sleep = parms->stats_interval;
-		do {
-			left_to_sleep = sleep(left_to_sleep);
-		} while (left_to_sleep > 0 && !hupped);
 	}
-	return NULL;
+	start_logging();
 }
-
-// Serialize the given state to a file descriptor, and return the (still open)
-// descriptor.
-int make_tempfile(const CubemapStateProto &state)
+	
+bool dry_run_config(const std::string &argv0, const std::string &config_filename)
 {
-	char tmpl[] = "/tmp/cubemapstate.XXXXXX";
-	int state_fd = mkstemp(tmpl);
-	if (state_fd == -1) {
-		perror("mkstemp");
-		exit(1);
+	char *argv0_copy = strdup(argv0.c_str());
+	char *config_filename_copy = strdup(config_filename.c_str());
+
+	pid_t pid = fork();
+	switch (pid) {
+	case -1:
+		log_perror("fork()");
+		free(argv0_copy);
+		free(config_filename_copy);
+		return false;
+	case 0:
+		// Child.
+		execlp(argv0_copy, argv0_copy, "--test-config", config_filename_copy, NULL);
+		log_perror(argv0_copy);
+		_exit(1);
+	default:
+		// Parent.
+		break;
 	}
+		
+	free(argv0_copy);
+	free(config_filename_copy);
+
+	int status;
+	pid_t err;
+	do {
+		err = waitpid(pid, &status, 0);
+	} while (err == -1 && errno == EINTR);
+
+	if (err == -1) {
+		log_perror("waitpid()");
+		return false;
+	}	
 
-	string serialized;
-	state.SerializeToString(&serialized);
+	return (WIFEXITED(status) && WEXITSTATUS(status) == 0);
+}
 
-	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);
+void find_deleted_streams(const Config &config, set<string> *deleted_urls)
+{
+	for (unsigned i = 0; i < config.streams.size(); ++i) {
+		const StreamConfig &stream_config = config.streams[i];
+		if (stream_config.src == "delete") {
+			log(INFO, "Deleting stream '%s'.", stream_config.url.c_str());
+			deleted_urls->insert(stream_config.url);
 		}
-
-		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)
+int main(int argc, char **argv)
 {
-	if (lseek(state_fd, 0, SEEK_SET) == -1) {
-		perror("lseek");
-		exit(1);
-	}
-
-	string serialized;
-	char buf[4096];
+	signal(SIGHUP, hup);
+	signal(SIGINT, hup);
+	signal(SIGUSR1, do_nothing);  // Used in internal signalling.
+	signal(SIGPIPE, SIG_IGN);
+	
+	// Parse options.
+	int state_fd = -1;
+	bool test_config = false;
 	for ( ;; ) {
-		ssize_t ret = read(state_fd, buf, sizeof(buf));
-		if (ret == -1) {
-			perror("read");
-			exit(1);
+		static const option long_options[] = {
+			{ "state", required_argument, 0, 's' },
+			{ "test-config", no_argument, 0, 't' },
+			{ 0, 0, 0, 0 }
+		};
+		int option_index = 0;
+		int c = getopt_long(argc, argv, "s:t", long_options, &option_index);
+     
+		if (c == -1) {
+			break;
 		}
-		if (ret == 0) {
-			// EOF.
+		switch (c) {
+		case 's':
+			state_fd = atoi(optarg);
 			break;
+		case 't':
+			test_config = true;
+			break;
+		default:
+			fprintf(stderr, "Unknown option '%s'\n", argv[option_index]);
+			exit(1);
 		}
+	}
 
-		serialized.append(string(buf, buf + ret));
+	string config_filename = "cubemap.config";
+	if (optind < argc) {
+		config_filename = argv[optind++];
 	}
 
-	close(state_fd);  // Implicitly deletes the file.
+	// Canonicalize argv[0] and config_filename.
+	char argv0_canon[PATH_MAX];
+	char config_filename_canon[PATH_MAX];
 
-	CubemapStateProto state;
-	if (!state.ParseFromString(serialized)) {
-		fprintf(stderr, "PANIC: Failed deserialization of state.\n");
+	if (realpath("/proc/self/exe", argv0_canon) == NULL) {
+		log_perror(argv[0]);
+		exit(1);
+	}
+	if (realpath(config_filename.c_str(), config_filename_canon) == NULL) {
+		log_perror(config_filename.c_str());
 		exit(1);
 	}
 
-	return state;
-}
+	// Now parse the configuration file.
+	Config config;
+	if (!parse_config(config_filename_canon, &config)) {
+		exit(1);
+	}
+	if (test_config) {
+		exit(0);
+	}
 	
-// Reuse mark pools if one already exists.
-MarkPool *get_mark_pool(map<pair<int, int>, MarkPool *> *mark_pools, int from, int to)
-{
-	pair<int, int> mark_range(from, to);
-	if (mark_pools->count(mark_range) != 0) {
-		return (*mark_pools)[mark_range];
-	}
-
-	// Check if we're overlapping some other mark pool.
-	for (map<pair<int, int>, MarkPool *>::const_iterator mp_it = mark_pools->begin();
-	     mp_it != mark_pools->end();
-	     ++mp_it) {
-		int other_from = mp_it->first.first;
-		int other_to = mp_it->first.second;
-		if ((from >= other_from && from < other_to) ||
-		    (to >= other_from && to < other_to)) {
-			fprintf(stderr, "WARNING: Mark pool %d-%d partially overlaps with %d-%d, you may get duplicate marks.\n",
-				from, to, other_from, other_to);
-			fprintf(stderr, "         Mark pools must either be completely disjunct, or completely overlapping.\n");
+	// Ideally we'd like to daemonize only when we've started up all threads etc.,
+	// but daemon() forks, which is not good in multithreaded software, so we'll
+	// have to do it here.
+	if (config.daemonize) {
+		if (daemon(0, 0) == -1) {
+			log_perror("daemon");
+			exit(1);
 		}
-	}	
-
-	MarkPool *mark_pool = new MarkPool(from, to);
-	mark_pools->insert(make_pair(mark_range, mark_pool));
-	return mark_pool;
-}
-
-int main(int argc, char **argv)
-{
-	fprintf(stderr, "\nCubemap starting.\n");
+	}
 
-	struct timeval serialize_start;
-	bool is_reexec = false;
+start:
+	// Open logs as soon as possible.
+	open_logs(config.log_destinations);
 
-	string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
-	vector<ConfigLine> config = parse_config(config_filename);
+	log(INFO, "Cubemap " SERVER_VERSION " starting.");
+	if (config.access_log_file.empty()) {
+		// Create a dummy logger.
+		access_log = new AccessLogThread();
+	} else {
+		access_log = new AccessLogThread(config.access_log_file);
+	}
+	access_log->run();
 
-	int port = fetch_config_int(config, "port", 1, 65535, PARAMATER_MANDATORY);
-	int num_servers = fetch_config_int(config, "num_servers", 1, 20000, PARAMATER_MANDATORY);  // Insanely high max limit.
+	servers = new ServerPool(config.num_servers);
 
-	servers = new ServerPool(num_servers);
+	// Find all the streams that are to be deleted.
+	set<string> deleted_urls;
+	find_deleted_streams(config, &deleted_urls);
 
 	CubemapStateProto loaded_state;
-	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) {
-		is_reexec = true;
-
-		fprintf(stderr, "Deserializing state from previous process... ");
-		int state_fd = atoi(argv[3]);
-		loaded_state = read_tempfile(state_fd);
+	struct timeval serialize_start;
+	set<string> deserialized_urls;
+	map<sockaddr_in6, Acceptor *, Sockaddr6Compare> deserialized_acceptors;
+	multimap<string, InputWithRefcount> inputs;  // multimap due to older versions without deduplication.
+	if (state_fd != -1) {
+		log(INFO, "Deserializing state from previous process...");
+		string serialized;
+		if (!read_tempfile_and_close(state_fd, &serialized)) {
+			exit(1);
+		}
+		if (!loaded_state.ParseFromString(serialized)) {
+			log(ERROR, "Failed deserialization of state.");
+			exit(1);
+		}
 
 		serialize_start.tv_sec = loaded_state.serialize_start_sec();
 		serialize_start.tv_usec = loaded_state.serialize_start_usec();
 
 		// Deserialize the streams.
+		map<string, string> stream_headers_for_url;  // See below.
 		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());
+			const StreamProto &stream = loaded_state.streams(i);
+
+			if (deleted_urls.count(stream.url()) != 0) {
+				// Delete the stream backlogs.
+				for (int j = 0; j < stream.data_fds_size(); ++j) {
+					safe_close(stream.data_fds(j));
+				}
+			} else {
+				vector<int> data_fds;
+				for (int j = 0; j < stream.data_fds_size(); ++j) {
+					data_fds.push_back(stream.data_fds(j));
+				}
+
+				servers->add_stream_from_serialized(stream, data_fds);
+				deserialized_urls.insert(stream.url());
+
+				stream_headers_for_url.insert(make_pair(stream.url(), stream.stream_header()));
+			}
 		}
 
-		// Deserialize the inputs. Note that we don't actually add them to any state yet.
+		// Deserialize the inputs. Note that we don't actually add them to any stream 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))));
-		} 
+			InputProto serialized_input = loaded_state.inputs(i);
 
-		// Deserialize the server socket.
-		server_sock = loaded_state.server_sock();
-		old_port = loaded_state.port();
-
-		fprintf(stderr, "done.\n");
-	}
+			InputWithRefcount iwr;
+			iwr.input = create_input(serialized_input);
+			iwr.refcount = 0;
+			inputs.insert(make_pair(serialized_input.url(), iwr));
+		} 
 
-	// Find all streams in the configuration file, and create them.
-	set<string> expecting_stream_ids = deserialized_stream_ids;
-	map<pair<int, int>, MarkPool *> mark_pools;
-	for (unsigned i = 0; i < config.size(); ++i) {
-		if (config[i].keyword != "stream") {
-			continue;
+		// Deserialize the acceptors.
+		for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
+			sockaddr_in6 sin6 = extract_address_from_acceptor_proto(loaded_state.acceptors(i));
+			deserialized_acceptors.insert(make_pair(
+				sin6,
+				new Acceptor(loaded_state.acceptors(i))));
 		}
-		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);
-
-		// Set up marks, if so desired.
-		if (config[i].parameters.count("mark")) {
-			string mark_str = config[i].parameters["mark"];
-			size_t split = mark_str.find_first_of('-');
-			if (split == string::npos) {
-				fprintf(stderr, "WARNING: Invalid mark specification '%s' (expected 'X-Y'), ignoring.\n",
-				        mark_str.c_str());
-				continue;
-			}
-
-			string from_str(mark_str.begin(), mark_str.begin() + split);
-			string to_str(mark_str.begin() + split + 1, mark_str.end());
-			int from = atoi(from_str.c_str());
-			int to = atoi(to_str.c_str());
-
-			if (from <= 0 || from >= 65536 || to <= 0 || to >= 65536) {
-				fprintf(stderr, "WARNING: Mark pool range %d-%d is outside legal range [1,65536>, ignoring.\n",
-				        from, to);
-				continue;
-			}
 
-			MarkPool *mark_pool = get_mark_pool(&mark_pools, from, to);
-			servers->set_mark_pool(stream_id, mark_pool);
-		}
+		log(INFO, "Deserialization done.");
 	}
 
-	// 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);
+	// Add any new inputs coming from the config.
+	create_config_inputs(config, &inputs);
+	
+	// Find all streams in the configuration file, create them, and connect to the inputs.
+	create_streams(config, deserialized_urls, &inputs);
+	vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
+	
+	// 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) {
+		if (deleted_urls.count(loaded_state.clients(i).url()) != 0) {
+			safe_close(loaded_state.clients(i).sock());
+		} else {
+			servers->add_client_from_serialized(loaded_state.clients(i));
 		}
 	}
-
-	// 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);
-	}
-
-	// See if the user wants stats.
-	string stats_file = fetch_config_string(config, "stats_file", PARAMETER_OPTIONAL);
-	int stats_interval = fetch_config_int(config, "stats_interval", 1, INT_MAX, PARAMETER_OPTIONAL, -1);
-	if (stats_interval != -1 && stats_file.empty()) {
-		fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n");
-	}
-
+	
 	servers->run();
 
-	pthread_t acceptor_thread;
-	pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
-
-	// 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);
+	// Now delete all inputs that are longer in use, and start the others.
+	for (multimap<string, InputWithRefcount>::iterator input_it = inputs.begin();
+	     input_it != inputs.end(); ) {
+		if (input_it->second.refcount == 0) {
+			log(WARNING, "Input '%s' no longer in use, closing.",
+			    input_it->first.c_str());
+			input_it->second.input->close_socket();
+			delete input_it->second.input;
+			inputs.erase(input_it++);
+		} else {
+			input_it->second.input->run();
+			++input_it;
 		}
-		input->run();
-		inputs.push_back(input);
 	}
-	
-	if (is_reexec) {	
-		// Put back the existing clients. It doesn't matter which server we
-		// allocate them to, so just do round-robin. However, we need to add
-		// them after the mark pools have been set up.
-		for (int i = 0; i < loaded_state.clients_size(); ++i) {
-			servers->add_client_from_serialized(loaded_state.clients(i));
-		}
+
+	// Start writing statistics.
+	StatsThread *stats_thread = NULL;
+	if (!config.stats_file.empty()) {
+		stats_thread = new StatsThread(config.stats_file, config.stats_interval);
+		stats_thread->run();
 	}
 
-	// All deserialized inputs should now have been taken care of, one way or the other.
-	assert(deserialized_inputs.empty());
+	InputStatsThread *input_stats_thread = NULL;
+	if (!config.input_stats_file.empty()) {
+		vector<Input*> inputs_no_refcount;
+		for (multimap<string, InputWithRefcount>::iterator input_it = inputs.begin();
+		     input_it != inputs.end(); ++input_it) {
+			inputs_no_refcount.push_back(input_it->second.input);
+		}
 
-	// Start writing statistics.
-	pthread_t stats_thread;
-	StatsThreadParameters stats_parameters;  // Must live for as long as the stats thread does.
-	if (!stats_file.empty()) {
-		stats_parameters.stats_file = stats_file;
-		stats_parameters.stats_interval = stats_interval;
-		pthread_create(&stats_thread, NULL, stats_thread_run, &stats_parameters);
+		input_stats_thread = new InputStatsThread(config.input_stats_file, config.input_stats_interval, inputs_no_refcount);
+		input_stats_thread->run();
 	}
 
-	signal(SIGHUP, hup);
-	
 	struct timeval server_start;
 	gettimeofday(&server_start, NULL);
-	if (is_reexec) {
+	if (state_fd != -1) {
 		// Measure time from we started deserializing (below) to now, when basically everything
 		// is up and running. This is, in other words, a conservative estimate of how long our
 		// “glitch” period was, not counting of course reconnects if the configuration changed.
 		double glitch_time = server_start.tv_sec - serialize_start.tv_sec +
 			1e-6 * (server_start.tv_usec - serialize_start.tv_usec);
-		fprintf(stderr, "Re-exec happened in approx. %.0f ms.\n", glitch_time * 1000.0);
+		log(INFO, "Re-exec happened in approx. %.0f ms.", glitch_time * 1000.0);
 	}
 
 	while (!hupped) {
@@ -487,55 +508,66 @@ int main(int argc, char **argv)
 	// OK, we've been HUPed. Time to shut down everything, serialize, and re-exec.
 	gettimeofday(&serialize_start, NULL);
 
-	if (!stats_file.empty()) {
-		pthread_kill(stats_thread, SIGHUP);
-		if (pthread_join(stats_thread, NULL) == -1) {
-			perror("pthread_join");
-			exit(1);
-		}
+	if (input_stats_thread != NULL) {
+		input_stats_thread->stop();
+		delete input_stats_thread;
 	}
-	pthread_kill(acceptor_thread, SIGHUP);
-	if (pthread_join(acceptor_thread, NULL) == -1) {
-		perror("pthread_join");
-		exit(1);
+	if (stats_thread != NULL) {
+		stats_thread->stop();
+		delete stats_thread;
 	}
-
-	CubemapStateProto state;
-	state.set_serialize_start_sec(serialize_start.tv_sec);
-	state.set_serialize_start_usec(serialize_start.tv_usec);
-	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 (size_t i = 0; i < acceptors.size(); ++i) {
+		acceptors[i]->stop();
 	}
+	for (multimap<string, InputWithRefcount>::iterator input_it = inputs.begin();
+	     input_it != inputs.end();
+	     ++input_it) {
+		input_it->second.input->stop();
+	}
+	servers->stop();
 
-	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));
+	CubemapStateProto state;
+	if (stopped) {
+		log(INFO, "Shutting down.");
+	} else {
+		log(INFO, "Serializing state and re-execing...");
+		state = collect_state(
+			serialize_start, acceptors, inputs, servers);
+		string serialized;
+		state.SerializeToString(&serialized);
+		state_fd = make_tempfile(serialized);
+		if (state_fd == -1) {
+			exit(1);
 		}
 	}
 	delete servers;
 
-	fprintf(stderr, "Serializing state and re-execing...\n");
-	int state_fd = make_tempfile(state);
+	access_log->stop();
+	delete access_log;
+	shut_down_logging();
 
+	if (stopped) {
+		exit(0);
+	}
+
+	// OK, so the signal was SIGHUP. Check that the new config is okay, then exec the new binary.
+	if (!dry_run_config(argv0_canon, config_filename_canon)) {
+		open_logs(config.log_destinations);
+		log(ERROR, "%s --test-config failed. Restarting old version instead of new.", argv[0]);
+		hupped = false;
+		shut_down_logging();
+		goto start;
+	}
+	 
 	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]);
+		execlp(argv0_canon, argv0_canon, config_filename_canon, "--state", buf, NULL);
+		open_logs(config.log_destinations);
+		log_perror("execlp");
+		log(ERROR, "re-exec of %s failed. Waiting 0.2 seconds and trying again...", argv0_canon);
+		shut_down_logging();
 		usleep(200000);
 	}
 }