#include <stdio.h>
#include <string.h>
#include <stdint.h>
+#include <unistd.h>
#include <assert.h>
+#include <getopt.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <pthread.h>
#include <sys/ioctl.h>
#include <sys/poll.h>
#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
#include <ctype.h>
CubemapStateProto collect_state(const timeval &serialize_start,
const vector<Acceptor *> acceptors,
const vector<Input *> inputs,
- ServerPool *servers,
- int num_servers)
+ ServerPool *servers)
{
- CubemapStateProto state;
+ 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);
state.add_inputs()->MergeFrom(inputs[i]->serialize());
}
- for (int i = 0; i < num_servers; ++i) {
- 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));
- }
- }
-
return state;
}
return state;
}
-// 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");
- }
- }
-
- MarkPool *mark_pool = new MarkPool(from, to);
- mark_pools->insert(make_pair(mark_range, mark_pool));
- return mark_pool;
-}
-
-MarkPool *parse_mark_pool(map<pair<int, int>, MarkPool *> *mark_pools, const string &mark_str)
-{
- 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());
- return NULL;
- }
-
- 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);
- return NULL;
- }
-
- return get_mark_pool(mark_pools, from, to);
-}
-
// Find all port statements in the configuration file, and create acceptors for htem.
vector<Acceptor *> create_acceptors(
- const vector<ConfigLine> &config,
+ const Config &config,
map<int, Acceptor *> *deserialized_acceptors)
{
vector<Acceptor *> acceptors;
- for (unsigned i = 0; i < config.size(); ++i) {
- if (config[i].keyword != "port") {
- continue;
- }
- if (config[i].arguments.size() != 1) {
- fprintf(stderr, "ERROR: 'port' takes exactly one argument\n");
- exit(1);
- }
- int port = atoi(config[i].arguments[0].c_str());
- if (port < 1 || port >= 65536) {
- fprintf(stderr, "WARNING: port %d is out of range (must be [1,65536>), ignoring\n", port);
- continue;
- }
-
+ for (unsigned i = 0; i < config.acceptors.size(); ++i) {
+ const AcceptorConfig &acceptor_config = config.acceptors[i];
Acceptor *acceptor = NULL;
map<int, Acceptor *>::iterator deserialized_acceptor_it =
- deserialized_acceptors->find(port);
+ deserialized_acceptors->find(acceptor_config.port);
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(port, TCP_SOCKET);
- acceptor = new Acceptor(server_sock, port);
+ int server_sock = create_server_socket(acceptor_config.port, TCP_SOCKET);
+ acceptor = new Acceptor(server_sock, acceptor_config.port);
}
acceptor->run();
acceptors.push_back(acceptor);
}
// Find all streams in the configuration file, and create inputs for them.
-vector<Input *> create_inputs(const vector<ConfigLine> &config,
+vector<Input *> create_inputs(const Config &config,
map<string, Input *> *deserialized_inputs)
{
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];
-
- map<string, string>::const_iterator src_it =
- config[i].parameters.find("src");
- if (src_it == config[i].parameters.end()) {
- fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n",
- stream_id.c_str());
+ for (unsigned i = 0; i < config.streams.size(); ++i) {
+ const StreamConfig &stream_config = config.streams[i];
+ if (stream_config.src.empty()) {
continue;
}
- string src = src_it->second;
+ string stream_id = stream_config.stream_id;
+ string src = stream_config.src;
+
Input *input = NULL;
map<string, Input *>::iterator deserialized_input_it =
deserialized_inputs->find(stream_id);
return inputs;
}
-void create_streams(const vector<ConfigLine> &config,
+void create_streams(const Config &config,
const set<string> &deserialized_stream_ids,
map<string, Input *> *deserialized_inputs)
{
+ vector<MarkPool *> mark_pools; // FIXME: leak
+ for (unsigned i = 0; i < config.mark_pools.size(); ++i) {
+ const MarkPoolConfig &mp_config = config.mark_pools[i];
+ mark_pools.push_back(new MarkPool(mp_config.from, mp_config.to));
+ }
+
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;
+ 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);
}
- 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.
- map<string, string>::const_iterator mark_parm_it =
- config[i].parameters.find("mark");
- if (mark_parm_it != config[i].parameters.end()) {
- MarkPool *mark_pool = parse_mark_pool(&mark_pools, mark_parm_it->second);
- servers->set_mark_pool(stream_id, mark_pool);
+ expecting_stream_ids.erase(stream_config.stream_id);
+
+ if (stream_config.mark_pool != -1) {
+ servers->set_mark_pool(stream_config.stream_id,
+ mark_pools[stream_config.mark_pool]);
}
}
}
}
}
+
+bool dry_run_config(const std::string &argv0, const std::string &config_filename)
+{
+ char *argv0_copy = strdup(argv0.c_str());
+ char *config_filename_copy = strdup(config_filename.c_str());
+
+ pid_t pid = fork();
+ switch (pid) {
+ case -1:
+ 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);
+ 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) {
+ perror("waitpid()");
+ return false;
+ }
+
+ return (WIFEXITED(status) && WEXITSTATUS(status) == 0);
+}
int main(int argc, char **argv)
{
- fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
-
- struct timeval serialize_start;
- bool is_reexec = false;
+ // Parse options.
+ int state_fd = -1;
+ bool test_config = false;
+ for ( ;; ) {
+ static const option long_options[] = {
+ { "state", required_argument, 0, 's' },
+ { "test-config", no_argument, 0, 't' },
+ };
+ int option_index = 0;
+ int c = getopt_long (argc, argv, "s:t", long_options, &option_index);
+
+ if (c == -1) {
+ break;
+ }
+ switch (c) {
+ case 's':
+ state_fd = atoi(optarg);
+ break;
+ case 't':
+ test_config = true;
+ break;
+ default:
+ assert(false);
+ }
+ }
- string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
- vector<ConfigLine> config = parse_config(config_filename);
+ string config_filename = "cubemap.config";
+ if (optind < argc) {
+ config_filename = argv[optind++];
+ }
- int num_servers = fetch_config_int(config, "num_servers", 1, 20000, PARAMATER_MANDATORY); // Insanely high max limit.
+ Config config;
+ if (!parse_config(config_filename, &config)) {
+ exit(1);
+ }
+ if (test_config) {
+ exit(0);
+ }
- servers = new ServerPool(num_servers);
+start:
+ fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
+ servers = new ServerPool(config.num_servers);
CubemapStateProto loaded_state;
+ struct timeval serialize_start;
set<string> deserialized_stream_ids;
map<string, Input *> deserialized_inputs;
map<int, Acceptor *> deserialized_acceptors;
- if (argc == 4 && strcmp(argv[2], "-state") == 0) {
- is_reexec = true;
-
+ if (state_fd != -1) {
fprintf(stderr, "Deserializing state from previous process... ");
- int state_fd = atoi(argv[3]);
loaded_state = read_tempfile(state_fd);
serialize_start.tv_sec = loaded_state.serialize_start_sec();
create_input(loaded_state.inputs(i))));
}
- // Convert the acceptor from older serialized formats.
- if (loaded_state.has_server_sock() && loaded_state.has_port()) {
- AcceptorProto *acceptor = loaded_state.add_acceptors();
- acceptor->set_server_sock(loaded_state.server_sock());
- acceptor->set_port(loaded_state.port());
- }
-
// Deserialize the acceptors.
for (int i = 0; i < loaded_state.acceptors_size(); ++i) {
deserialized_acceptors.insert(make_pair(
// Find all streams in the configuration file, and create them.
create_streams(config, deserialized_stream_ids, &deserialized_inputs);
- // 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();
vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
// All deserialized inputs should now have been taken care of, one way or the other.
assert(deserialized_inputs.empty());
- 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));
- }
+ // 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 (!stats_file.empty()) {
- stats_thread = new StatsThread(stats_file, stats_interval);
+ 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 (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.
servers->stop();
fprintf(stderr, "Serializing state and re-execing...\n");
- int state_fd = make_tempfile(collect_state(
- serialize_start, acceptors, inputs, servers, num_servers));
+ state_fd = make_tempfile(collect_state(
+ serialize_start, acceptors, inputs, servers));
delete servers;
+
+ if (!dry_run_config(argv[0], config_filename)) {
+ fprintf(stderr, "ERROR: %s --test-config failed. Restarting old version instead of new.\n", argv[0]);
+ hupped = false;
+ goto start;
+ }
char buf[16];
sprintf(buf, "%d", state_fd);
for ( ;; ) {
- execlp(argv[0], argv[0], config_filename.c_str(), "-state", buf, NULL);
+ 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);
projects / cubemap / blobdiff