#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 <map>
#include <set>
+#include "markpool.h"
#include "metacube.h"
#include "parse.h"
#include "server.h"
#include "input.h"
#include "state.pb.h"
-#define STREAM_ID "stream"
-#define STREAM_URL "http://gruessi.zrh.sesse.net:4013/"
-
using namespace std;
ServerPool *servers = NULL;
pfd.events = POLLIN;
int nfds = poll(&pfd, 1, 50);
- if (nfds == 0 || (nfds == -1 && errno == EAGAIN)) {
+ if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
continue;
}
if (nfds == -1) {
return NULL;
}
+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;
+ }
+
+ fp = fdopen(fd, "w");
+ if (fp == NULL) {
+ perror("fdopen");
+ close(fd);
+ unlink(filename);
+ free(filename);
+ goto sleep;
+ }
+
+ 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;
+ }
+
+ if (rename(filename, parms->stats_file.c_str()) == -1) {
+ perror("rename");
+ unlink(filename);
+ }
+
+sleep:
+ int left_to_sleep = parms->stats_interval;
+ do {
+ left_to_sleep = sleep(left_to_sleep);
+ } while (left_to_sleep > 0 && !hupped);
+ }
+ return NULL;
+}
+
// Serialize the given state to a file descriptor, and return the (still open)
// descriptor.
int make_tempfile(const CubemapStateProto &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;
+}
int main(int argc, char **argv)
{
fprintf(stderr, "\nCubemap starting.\n");
+ struct timeval serialize_start;
+ bool is_reexec = false;
+
string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
vector<ConfigLine> config = parse_config(config_filename);
- int port = fetch_config_int(config, "port", 1, 65535);
- int num_servers = fetch_config_int(config, "num_servers", 1, 20000); // Insanely high max limit.
+ 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(num_servers);
+ 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]);
- CubemapStateProto loaded_state = read_tempfile(state_fd);
+ loaded_state = read_tempfile(state_fd);
+
+ serialize_start.tv_sec = loaded_state.serialize_start_sec();
+ serialize_start.tv_usec = loaded_state.serialize_start_usec();
// Deserialize the streams.
for (int i = 0; i < loaded_state.streams_size(); ++i) {
deserialized_stream_ids.insert(loaded_state.streams(i).stream_id());
}
- // 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) {
- servers->add_client_from_serialized(loaded_state.clients(i));
- }
-
// Deserialize the inputs. Note that we don't actually add them to any state yet.
for (int i = 0; i < loaded_state.inputs_size(); ++i) {
deserialized_inputs.insert(make_pair(
// 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;
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);
+ }
}
// Warn about any servers we've lost.
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;
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));
+ }
+ }
// All deserialized inputs should now have been taken care of, one way or the other.
assert(deserialized_inputs.empty());
+ // 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);
+ }
+
signal(SIGHUP, hup);
+
+ struct timeval server_start;
+ gettimeofday(&server_start, NULL);
+ if (is_reexec) {
+ // 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);
+ }
while (!hupped) {
usleep(100000);
}
// 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);
+ }
+ }
+ pthread_kill(acceptor_thread, SIGHUP);
if (pthread_join(acceptor_thread, NULL) == -1) {
perror("pthread_join");
exit(1);
}
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);
projects / cubemap / blobdiff