#include <stdint.h>
#include <assert.h>
#include <arpa/inet.h>
-#include <curl/curl.h>
#include <sys/socket.h>
#include <pthread.h>
#include <sys/types.h>
#include <sys/ioctl.h>
-#include <sys/epoll.h>
+#include <sys/poll.h>
#include <signal.h>
#include <errno.h>
#include <ctype.h>
#include <vector>
#include <string>
#include <map>
+#include <set>
#include "metacube.h"
+#include "parse.h"
#include "server.h"
+#include "serverpool.h"
#include "input.h"
#include "state.pb.h"
-#define NUM_SERVERS 4
#define STREAM_ID "stream"
#define STREAM_URL "http://gruessi.zrh.sesse.net:4013/"
-#define PORT 9094
using namespace std;
-Server *servers = NULL;
+ServerPool *servers = NULL;
volatile bool hupped = false;
void hup(int ignored)
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;
void *acceptor_thread_run(void *arg)
{
int server_sock = int(intptr_t(arg));
- int num_accepted = 0;
- for ( ;; ) {
+ 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 == EAGAIN)) {
+ continue;
+ }
+ if (nfds == -1) {
+ perror("poll");
+ usleep(100000);
+ continue;
+ }
+
sockaddr_in6 addr;
socklen_t addrlen = sizeof(addr);
}
if (sock == -1) {
perror("accept");
- exit(1);
+ usleep(100000);
+ continue;
}
// Set the socket as nonblocking.
}
// Pick a server, round-robin, and hand over the socket to it.
- servers[num_accepted % NUM_SERVERS].add_client(sock);
- ++num_accepted;
+ servers->add_client(sock);
}
+ return NULL;
}
// Serialize the given state to a file descriptor, and return the (still open)
return state;
}
-// Split a line on whitespace, e.g. "foo bar baz" -> {"foo", "bar", "baz"}.
-vector<string> split_tokens(const string &line)
-{
- vector<string> ret;
- string current_token;
-
- for (size_t i = 0; i < line.size(); ++i) {
- if (isspace(line[i])) {
- if (!current_token.empty()) {
- ret.push_back(current_token);
- }
- current_token.clear();
- } else {
- current_token.push_back(line[i]);
- }
- }
- if (!current_token.empty()) {
- ret.push_back(current_token);
- }
- return ret;
-}
-
-struct ConfigLine {
- string keyword;
- vector<string> arguments;
- map<string, string> parameters;
-};
-
-// Parse the configuration file.
-vector<ConfigLine> parse_config(const string &filename)
-{
- vector<ConfigLine> ret;
-
- FILE *fp = fopen(filename.c_str(), "r");
- if (fp == NULL) {
- perror(filename.c_str());
- exit(1);
- }
-
- char buf[4096];
- while (!feof(fp)) {
- if (fgets(buf, sizeof(buf), fp) == NULL) {
- break;
- }
-
- // Chop off the string at the first #, \r or \n.
- buf[strcspn(buf, "#\r\n")] = 0;
-
- // Remove all whitespace from the end of the string.
- size_t len = strlen(buf);
- while (len > 0 && isspace(buf[len - 1])) {
- buf[--len] = 0;
- }
-
- // If the line is now all blank, ignore it.
- if (len == 0) {
- continue;
- }
-
- vector<string> tokens = split_tokens(buf);
- assert(!tokens.empty());
-
- ConfigLine line;
- line.keyword = tokens[0];
-
- for (size_t i = 1; i < tokens.size(); ++i) {
- // foo=bar is a parameter; anything else is an argument.
- size_t equals_pos = tokens[i].find_first_of('=');
- if (equals_pos == string::npos) {
- line.arguments.push_back(tokens[i]);
- } else {
- string key = tokens[i].substr(0, equals_pos);
- string value = tokens[i].substr(equals_pos + 1, string::npos);
- line.parameters.insert(make_pair(key, value));
- }
- }
-
- ret.push_back(line);
- }
-
- fclose(fp);
-}
-
int main(int argc, char **argv)
{
fprintf(stderr, "\nCubemap starting.\n");
string config_filename = (argc == 1) ? "cubemap.config" : argv[1];
vector<ConfigLine> config = parse_config(config_filename);
- servers = new Server[NUM_SERVERS];
+ 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 server_sock;
+ servers = new ServerPool(num_servers);
+
+ int server_sock = -1, old_port = -1;
+ set<string> deserialized_stream_ids;
if (argc == 4 && strcmp(argv[2], "-state") == 0) {
fprintf(stderr, "Deserializing state from previous process... ");
int state_fd = atoi(argv[3]);
// Deserialize the streams.
for (int i = 0; i < loaded_state.streams_size(); ++i) {
- for (int j = 0; j < NUM_SERVERS; ++j) {
- servers[j].add_stream_from_serialized(loaded_state.streams(i));
- }
+ servers->add_stream_from_serialized(loaded_state.streams(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[i % NUM_SERVERS].add_client_from_serialized(loaded_state.clients(i));
+ servers->add_client_from_serialized(loaded_state.clients(i));
}
// Deserialize the server socket.
server_sock = loaded_state.server_sock();
+ old_port = loaded_state.port();
fprintf(stderr, "done.\n");
- } else {
- // TODO: This should come from a config file.
- server_sock = create_server_socket(PORT);
- for (int i = 0; i < NUM_SERVERS; ++i) {
- servers[i].add_stream(STREAM_ID);
+ }
+
+ // Find all streams in the configuration file, and create them.
+ set<string> expecting_stream_ids = deserialized_stream_ids;
+ for (unsigned i = 0; i < config.size(); ++i) {
+ if (config[i].keyword != "stream") {
+ continue;
}
+ 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);
}
- for (int i = 0; i < NUM_SERVERS; ++i) {
- servers[i].run();
+ // Warn about any servers we've lost.
+ // TODO: Make an option (delete=yes?) to actually shut down streams.
+ for (set<string>::const_iterator stream_it = expecting_stream_ids.begin();
+ stream_it != expecting_stream_ids.end();
+ ++stream_it) {
+ fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n",
+ stream_it->c_str());
+ fprintf(stderr, " It will not be deleted, but clients will not get any new inputs.\n");
}
+ // Open a new server socket if we do not already have one, or if we changed ports.
+ if (server_sock != -1 && port != old_port) {
+ fprintf(stderr, "NOTE: Port changed from %d to %d; opening new socket.\n", old_port, port);
+ close(server_sock);
+ server_sock = -1;
+ }
+ if (server_sock == -1) {
+ server_sock = create_server_socket(port);
+ }
+
+ servers->run();
+
pthread_t acceptor_thread;
pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
- Input input(STREAM_ID, STREAM_URL);
- input.run();
+ // Find all streams in the configuration file, and create inputs for them.
+ 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];
+
+ if (config[i].parameters.count("src") == 0) {
+ fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n",
+ stream_id.c_str());
+ continue;
+ }
+
+ string src = config[i].parameters["src"];
+ Input *input = new Input(stream_id, src);
+ input->run();
+ inputs.push_back(input);
+ }
signal(SIGHUP, hup);
usleep(100000);
}
- input.stop();
+ // OK, we've been HUPed. Time to shut down everything, serialize, and re-exec.
+ for (size_t i = 0; i < inputs.size(); ++i) {
+ inputs[i]->stop();
+ delete inputs[i]; // TODO: Serialize.
+ }
+
+ if (pthread_join(acceptor_thread, NULL) == -1) {
+ perror("pthread_join");
+ exit(1);
+ }
CubemapStateProto state;
state.set_server_sock(server_sock);
- for (int i = 0; i < NUM_SERVERS; ++i) {
- servers[i].stop();
+ state.set_port(port);
+ for (int i = 0; i < num_servers; ++i) {
+ servers->get_server(i)->stop();
- CubemapStateProto local_state = servers[i].serialize();
+ 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.add_clients()->MergeFrom(local_state.clients(j));
}
}
- delete[] servers;
+ delete servers;
fprintf(stderr, "Serializing state and re-execing...\n");
int state_fd = make_tempfile(state);
projects / cubemap / blobdiff