X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=e8fa4e822ce720be53dc29f03de40ed31b1addc6;hp=2771f3904048fc86fde47097ed0d50b463f89576;hb=03569c70282f68a4bc9b259fbf5b7a2b4c5594b3;hpb=cd2eb6436f31c562174d9ee055aef3481bf752a3

diff --git a/main.cpp b/main.cpp
index 2771f39..e8fa4e8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,38 +1,29 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
 #include <assert.h>
+#include <errno.h>
 #include <getopt.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 <signal.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <signal.h>
-#include <errno.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include <vector>
-#include <string>
+#include <unistd.h>
 #include <map>
 #include <set>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "acceptor.h"
 #include "config.h"
+#include "input.h"
 #include "markpool.h"
-#include "metacube.h"
-#include "parse.h"
-#include "server.h"
 #include "serverpool.h"
-#include "input.h"
+#include "state.pb.h"
 #include "stats.h"
+#include "util.h"
 #include "version.h"
-#include "state.pb.h"
 
 using namespace std;
 
@@ -44,36 +35,6 @@ void hup(int ignored)
 	hupped = true;
 }
 
-// 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;
-}
-
 CubemapStateProto collect_state(const timeval &serialize_start,
                                 const vector<Acceptor *> acceptors,
                                 const vector<Input *> inputs,
@@ -94,42 +55,6 @@ CubemapStateProto collect_state(const timeval &serialize_start,
 	return state;
 }
 
-// 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;
-}
-	
 // Find all port statements in the configuration file, and create acceptors for htem.
 vector<Acceptor *> create_acceptors(
 	const Config &config,
@@ -219,7 +144,9 @@ void create_streams(const Config &config,
 	for (unsigned i = 0; i < config.streams.size(); ++i) {
 		const StreamConfig &stream_config = config.streams[i];
 		if (deserialized_stream_ids.count(stream_config.stream_id) == 0) {
-			servers->add_stream(stream_config.stream_id);
+			servers->add_stream(stream_config.stream_id, stream_config.backlog_size);
+		} else {
+			servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
 		}
 		expecting_stream_ids.erase(stream_config.stream_id);
 
@@ -286,6 +213,9 @@ bool dry_run_config(const std::string &argv0, const std::string &config_filename
 
 int main(int argc, char **argv)
 {
+	signal(SIGHUP, hup);
+	signal(SIGPIPE, SIG_IGN);
+	
 	// Parse options.
 	int state_fd = -1;
 	bool test_config = false;
@@ -336,7 +266,14 @@ start:
 	map<int, Acceptor *> deserialized_acceptors;
 	if (state_fd != -1) {
 		fprintf(stderr, "Deserializing state from previous process... ");
-		loaded_state = read_tempfile(state_fd);
+		string serialized;
+		if (!read_tempfile(state_fd, &serialized)) {
+			exit(1);
+		}
+		if (!loaded_state.ParseFromString(serialized)) {
+			fprintf(stderr, "ERROR: Failed deserialization of state.\n");
+			exit(1);
+		}
 
 		serialize_start.tv_sec = loaded_state.serialize_start_sec();
 		serialize_start.tv_usec = loaded_state.serialize_start_usec();
@@ -367,8 +304,6 @@ start:
 	// Find all streams in the configuration file, and create them.
 	create_streams(config, deserialized_stream_ids, &deserialized_inputs);
 
-	servers->run();
-
 	vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
 	vector<Input *> inputs = create_inputs(config, &deserialized_inputs);
 	
@@ -381,18 +316,16 @@ start:
 	for (int i = 0; i < loaded_state.clients_size(); ++i) {
 		servers->add_client_from_serialized(loaded_state.clients(i));
 	}
+	
+	servers->run();
 
 	// 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();
-	} else if (config.stats_interval != -1) {
-		fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n");
 	}
 
-	signal(SIGHUP, hup);
-	
 	struct timeval server_start;
 	gettimeofday(&server_start, NULL);
 	if (state_fd != -1) {
@@ -423,8 +356,14 @@ start:
 	servers->stop();
 
 	fprintf(stderr, "Serializing state and re-execing...\n");
-	state_fd = make_tempfile(collect_state(
-		serialize_start, acceptors, inputs, servers));
+	CubemapStateProto 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;
 
 	if (!dry_run_config(argv[0], config_filename)) {