return state_fd;
}
+CubemapStateProto collect_state(const timeval &serialize_start,
+ int server_sock,
+ int port,
+ const vector<Input *> inputs,
+ ServerPool *servers,
+ int num_servers)
+{
+ 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);
+
+ for (size_t i = 0; i < inputs.size(); ++i) {
+ 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;
+}
+
// Read the state back from the file descriptor made by make_tempfile,
// and close it.
CubemapStateProto read_tempfile(int state_fd)
return get_mark_pool(mark_pools, from, to);
}
+
+// Find all streams in the configuration file, and create inputs for them.
+vector<Input *> create_inputs(const vector<ConfigLine> &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());
+ continue;
+ }
+
+ string src = src_it->second;
+ Input *input = NULL;
+ map<string, Input *>::iterator deserialized_input_it =
+ deserialized_inputs->find(stream_id);
+ if (deserialized_input_it != deserialized_inputs->end()) {
+ input = deserialized_input_it->second;
+ if (input->get_url() != src) {
+ fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n",
+ stream_id.c_str(), input->get_url().c_str(), src.c_str());
+ delete input;
+ input = NULL;
+ }
+ deserialized_inputs->erase(deserialized_input_it);
+ }
+ if (input == NULL) {
+ input = new Input(stream_id, src);
+ }
+ input->run();
+ inputs.push_back(input);
+ }
+ return inputs;
+}
+
+void create_streams(const vector<ConfigLine> &config,
+ const set<string> &deserialized_stream_ids,
+ map<string, Input *> *deserialized_inputs)
+{
+ 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;
+ }
+ 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);
+ }
+ }
+
+ // 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) {
+ string stream_id = *stream_it;
+ fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n",
+ stream_id.c_str());
+ fprintf(stderr, " It will not be deleted, but clients will not get any new inputs.\n");
+ if (deserialized_inputs->count(stream_id) != 0) {
+ delete (*deserialized_inputs)[stream_id];
+ deserialized_inputs->erase(stream_id);
+ }
+ }
+}
int main(int argc, char **argv)
{
}
// 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;
- }
- 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.
- 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.
- // 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) {
- string stream_id = *stream_it;
- fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n",
- stream_id.c_str());
- fprintf(stderr, " It will not be deleted, but clients will not get any new inputs.\n");
- if (deserialized_inputs.count(stream_id) != 0) {
- delete deserialized_inputs[stream_id];
- deserialized_inputs.erase(stream_id);
- }
- }
+ create_streams(config, deserialized_stream_ids, &deserialized_inputs);
// Open a new server socket if we do not already have one, or if we changed ports.
if (server_sock != -1 && port != old_port) {
if (stats_interval != -1 && stats_file.empty()) {
fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n");
}
- StatsThread *stats_thread = NULL;
- if (!stats_file.empty()) {
- stats_thread = new StatsThread(stats_file, stats_interval);
- }
servers->run();
- pthread_t acceptor_thread;
- pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
+ AcceptorThread acceptor_thread(server_sock);
+ acceptor_thread.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 = NULL;
- if (deserialized_inputs.count(stream_id) != 0) {
- input = deserialized_inputs[stream_id];
- if (input->get_url() != src) {
- fprintf(stderr, "INFO: Stream '%s' has changed URL from '%s' to '%s', restarting input.\n",
- stream_id.c_str(), input->get_url().c_str(), src.c_str());
- delete input;
- input = NULL;
- }
- deserialized_inputs.erase(stream_id);
- }
- if (input == NULL) {
- input = new Input(stream_id, src);
- }
- input->run();
- inputs.push_back(input);
- }
+ vector<Input *> inputs = create_inputs(config, &deserialized_inputs);
+
+ // 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
}
}
- // All deserialized inputs should now have been taken care of, one way or the other.
- assert(deserialized_inputs.empty());
-
// Start writing statistics.
- if (stats_thread != NULL) {
+ StatsThread *stats_thread = NULL;
+ if (!stats_file.empty()) {
+ stats_thread = new StatsThread(stats_file, stats_interval);
stats_thread->run();
}
if (stats_thread != NULL) {
stats_thread->stop();
}
- 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);
-
+ acceptor_thread.stop();
for (size_t i = 0; i < inputs.size(); ++i) {
inputs[i]->stop();
- state.add_inputs()->MergeFrom(inputs[i]->serialize());
}
-
for (int i = 0; i < num_servers; ++i) {
servers->get_server(i)->stop();
-
- 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));
- }
}
- delete servers;
fprintf(stderr, "Serializing state and re-execing...\n");
- int state_fd = make_tempfile(state);
-
+ int state_fd = make_tempfile(collect_state(
+ serialize_start, server_sock, port, inputs, servers, num_servers));
+ delete servers;
+
char buf[16];
sprintf(buf, "%d", state_fd);
projects / cubemap / blobdiff