#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;
}
}
}
}
+
+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");
+ // 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);
+ }
+ }
- struct timeval serialize_start;
- bool is_reexec = false;
+ string config_filename = "cubemap.config";
+ if (optind < argc) {
+ config_filename = argv[optind++];
+ }
- string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
Config config;
if (!parse_config(config_filename, &config)) {
exit(1);
- }
+ }
+ if (test_config) {
+ exit(0);
+ }
+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(
// 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.
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, config.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