X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=dc52bdc29a17ab85f1ad1d5c8f23ef34a54c0604;hp=1773af3bff7e9341ef89e7ae39dd9e41813f1f88;hb=3b2b74d6be17096c2fe830bfa07fbcecb4460b81;hpb=9f49ea1bf5d45f57c351601a80d543056185924c diff --git a/main.cpp b/main.cpp index 1773af3..dc52bdc 100644 --- a/main.cpp +++ b/main.cpp @@ -18,6 +18,8 @@ #include #include +#include "acceptor.h" +#include "markpool.h" #include "metacube.h" #include "parse.h" #include "server.h" @@ -35,98 +37,6 @@ void hup(int ignored) hupped = true; } -int create_server_socket(int port) -{ - int server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP); - if (server_sock == -1) { - perror("socket"); - exit(1); - } - - int one = 1; - if (setsockopt(server_sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) == -1) { - perror("setsockopt(SO_REUSEADDR)"); - exit(1); - } - - // 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); - } - - // 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); - } - - sockaddr_in6 addr; - memset(&addr, 0, sizeof(addr)); - addr.sin6_family = AF_INET6; - addr.sin6_port = htons(port); - - if (bind(server_sock, reinterpret_cast(&addr), sizeof(addr)) == -1) { - perror("bind"); - exit(1); - } - - if (listen(server_sock, 128) == -1) { - perror("listen"); - exit(1); - } - - return server_sock; -} - -void *acceptor_thread_run(void *arg) -{ - 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; - } - - sockaddr_in6 addr; - socklen_t addrlen = sizeof(addr); - - // Get a new socket. - int sock = accept(server_sock, reinterpret_cast(&addr), &addrlen); - if (sock == -1 && errno == EINTR) { - continue; - } - if (sock == -1) { - perror("accept"); - usleep(100000); - continue; - } - - // Set the socket as nonblocking. - int one = 1; - if (ioctl(sock, FIONBIO, &one) == -1) { - perror("FIONBIO"); - exit(1); - } - - // Pick a server, round-robin, and hand over the socket to it. - servers->add_client(sock); - } - return NULL; -} - struct StatsThreadParameters { string stats_file; int stats_interval; @@ -254,6 +164,56 @@ CubemapStateProto read_tempfile(int state_fd) return state; } + +// Reuse mark pools if one already exists. +MarkPool *get_mark_pool(map, MarkPool *> *mark_pools, int from, int to) +{ + pair 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, 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, 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); +} int main(int argc, char **argv) { @@ -270,6 +230,7 @@ int main(int argc, char **argv) servers = new ServerPool(num_servers); + CubemapStateProto loaded_state; int server_sock = -1, old_port = -1; set deserialized_stream_ids; map deserialized_inputs; @@ -278,7 +239,7 @@ int main(int argc, char **argv) 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(); @@ -289,12 +250,6 @@ int main(int argc, char **argv) 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( @@ -311,6 +266,7 @@ int main(int argc, char **argv) // Find all streams in the configuration file, and create them. set expecting_stream_ids = deserialized_stream_ids; + map, MarkPool *> mark_pools; for (unsigned i = 0; i < config.size(); ++i) { if (config[i].keyword != "stream") { continue; @@ -324,6 +280,12 @@ int main(int argc, char **argv) servers->add_stream(stream_id); } expecting_stream_ids.erase(stream_id); + + // Set up marks, if so desired. + if (config[i].parameters.count("mark")) { + MarkPool *mark_pool = parse_mark_pool(&mark_pools, config[i].parameters["mark"]); + servers->set_mark_pool(stream_id, mark_pool); + } } // Warn about any servers we've lost. @@ -396,6 +358,15 @@ int main(int argc, char **argv) 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());