#include <utility>
#include <vector>
+#include "accesslog.h"
#include "acceptor.h"
#include "config.h"
#include "input.h"
using namespace std;
+AccessLogThread *access_log = NULL;
ServerPool *servers = NULL;
+vector<MarkPool *> mark_pools;
volatile bool hupped = false;
volatile bool stopped = false;
+struct InputWithRefcount {
+ Input *input;
+ int refcount;
+};
+
void hup(int signum)
{
hupped = true;
CubemapStateProto collect_state(const timeval &serialize_start,
const vector<Acceptor *> acceptors,
- const vector<Input *> inputs,
+ const multimap<string, InputWithRefcount> inputs,
ServerPool *servers)
{
CubemapStateProto state = servers->serialize(); // Fills streams() and clients().
state.add_acceptors()->MergeFrom(acceptors[i]->serialize());
}
- for (size_t i = 0; i < inputs.size(); ++i) {
- state.add_inputs()->MergeFrom(inputs[i]->serialize());
+ for (multimap<string, InputWithRefcount>::const_iterator input_it = inputs.begin();
+ input_it != inputs.end();
+ ++input_it) {
+ state.add_inputs()->MergeFrom(input_it->second.input->serialize());
}
return state;
}
// Find all streams in the configuration file, and create inputs for them.
-vector<Input *> create_inputs(const Config &config,
- map<string, Input *> *deserialized_inputs)
+void create_config_inputs(const Config &config, multimap<string, InputWithRefcount> *inputs)
{
- vector<Input *> inputs;
for (unsigned i = 0; i < config.streams.size(); ++i) {
const StreamConfig &stream_config = config.streams[i];
if (stream_config.src.empty()) {
continue;
}
- string stream_id = stream_config.stream_id;
string src = stream_config.src;
-
- 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) {
- log(INFO, "Stream '%s' has changed URL from '%s' to '%s', restarting input.",
- stream_id.c_str(), input->get_url().c_str(), src.c_str());
- input->close_socket();
- delete input;
- input = NULL;
- }
- deserialized_inputs->erase(deserialized_input_it);
+ if (inputs->count(src) != 0) {
+ continue;
}
- if (input == NULL) {
- input = create_input(stream_id, src);
- if (input == NULL) {
- log(ERROR, "did not understand URL '%s', clients will not get any data.",
- src.c_str());
- continue;
- }
+
+ InputWithRefcount iwr;
+ iwr.input = create_input(src);
+ if (iwr.input == NULL) {
+ log(ERROR, "did not understand URL '%s', clients will not get any data.",
+ src.c_str());
+ continue;
}
- input->run();
- inputs.push_back(input);
+ iwr.refcount = 0;
+ inputs->insert(make_pair(src, iwr));
}
- return inputs;
}
void create_streams(const Config &config,
const set<string> &deserialized_stream_ids,
- map<string, Input *> *deserialized_inputs)
+ multimap<string, InputWithRefcount> *inputs)
{
- vector<MarkPool *> mark_pools; // FIXME: leak
for (unsigned i = 0; i < config.mark_pools.size(); ++i) {
const MarkPoolConfig &mp_config = config.mark_pools[i];
mark_pools.push_back(new MarkPool(mp_config.from, mp_config.to));
for (unsigned i = 0; i < config.streams.size(); ++i) {
const StreamConfig &stream_config = config.streams[i];
if (deserialized_stream_ids.count(stream_config.stream_id) == 0) {
- servers->add_stream(stream_config.stream_id, stream_config.backlog_size);
+ servers->add_stream(stream_config.stream_id,
+ stream_config.backlog_size,
+ Stream::Encoding(stream_config.encoding));
} else {
servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
+ servers->set_encoding(stream_config.stream_id,
+ Stream::Encoding(stream_config.encoding));
}
expecting_stream_ids.erase(stream_config.stream_id);
servers->set_mark_pool(stream_config.stream_id,
mark_pools[stream_config.mark_pool]);
}
+
+ string src = stream_config.src;
+ if (!src.empty()) {
+ multimap<string, InputWithRefcount>::iterator input_it = inputs->find(src);
+ assert(input_it != inputs->end());
+ input_it->second.input->add_destination(stream_config.stream_id);
+ ++input_it->second.refcount;
+ }
}
// Warn about any servers we've lost.
log(WARNING, "stream '%s' disappeared from the configuration file. "
"It will not be deleted, but clients will not get any new inputs.",
stream_id.c_str());
- if (deserialized_inputs->count(stream_id) != 0) {
- delete (*deserialized_inputs)[stream_id];
- deserialized_inputs->erase(stream_id);
- }
}
}
static const option long_options[] = {
{ "state", required_argument, 0, 's' },
{ "test-config", no_argument, 0, 't' },
+ { 0, 0, 0, 0 }
};
int option_index = 0;
- int c = getopt_long (argc, argv, "s:t", long_options, &option_index);
+ int c = getopt_long(argc, argv, "s:t", long_options, &option_index);
if (c == -1) {
break;
test_config = true;
break;
default:
- assert(false);
+ fprintf(stderr, "Unknown option '%s'\n", argv[option_index]);
+ exit(1);
}
}
char config_filename_canon[PATH_MAX];
if (realpath(argv[0], argv0_canon) == NULL) {
- log_perror("realpath");
+ log_perror(argv[0]);
exit(1);
}
if (realpath(config_filename.c_str(), config_filename_canon) == NULL) {
- log_perror("realpath");
+ log_perror(config_filename.c_str());
exit(1);
}
open_logs(config.log_destinations);
log(INFO, "Cubemap " SERVER_VERSION " starting.");
+ if (config.access_log_file.empty()) {
+ // Create a dummy logger.
+ access_log = new AccessLogThread();
+ } else {
+ access_log = new AccessLogThread(config.access_log_file);
+ }
+ access_log->run();
+
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;
+ multimap<string, InputWithRefcount> inputs; // multimap due to older versions without deduplication.
if (state_fd != -1) {
log(INFO, "Deserializing state from previous process...");
string serialized;
deserialized_stream_ids.insert(loaded_state.streams(i).stream_id());
}
- // Deserialize the inputs. Note that we don't actually add them to any state yet.
+ // Deserialize the inputs. Note that we don't actually add them to any stream yet.
for (int i = 0; i < loaded_state.inputs_size(); ++i) {
- deserialized_inputs.insert(make_pair(
- loaded_state.inputs(i).stream_id(),
- create_input(loaded_state.inputs(i))));
+ InputWithRefcount iwr;
+ iwr.input = create_input(loaded_state.inputs(i));
+ iwr.refcount = 0;
+ inputs.insert(make_pair(loaded_state.inputs(i).url(), iwr));
}
// Deserialize the acceptors.
log(INFO, "Deserialization done.");
}
- // Find all streams in the configuration file, and create them.
- create_streams(config, deserialized_stream_ids, &deserialized_inputs);
-
- vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
- vector<Input *> inputs = create_inputs(config, &deserialized_inputs);
+ // Add any new inputs coming from the config.
+ create_config_inputs(config, &inputs);
- // All deserialized inputs should now have been taken care of, one way or the other.
- assert(deserialized_inputs.empty());
+ // Find all streams in the configuration file, create them, and connect to the inputs.
+ create_streams(config, deserialized_stream_ids, &inputs);
+ vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
// 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
servers->run();
+ // Now delete all inputs that are longer in use, and start the others.
+ for (multimap<string, InputWithRefcount>::iterator input_it = inputs.begin();
+ input_it != inputs.end(); ) {
+ if (input_it->second.refcount == 0) {
+ log(WARNING, "Input '%s' no longer in use, closing.",
+ input_it->first.c_str());
+ input_it->second.input->close_socket();
+ delete input_it->second.input;
+ inputs.erase(input_it++);
+ } else {
+ input_it->second.input->run();
+ ++input_it;
+ }
+ }
+
// Start writing statistics.
StatsThread *stats_thread = NULL;
if (!config.stats_file.empty()) {
if (stats_thread != NULL) {
stats_thread->stop();
+ delete stats_thread;
}
for (size_t i = 0; i < acceptors.size(); ++i) {
acceptors[i]->stop();
}
- for (size_t i = 0; i < inputs.size(); ++i) {
- inputs[i]->stop();
+ for (multimap<string, InputWithRefcount>::iterator input_it = inputs.begin();
+ input_it != inputs.end();
+ ++input_it) {
+ input_it->second.input->stop();
}
servers->stop();
}
}
delete servers;
+
+ for (unsigned i = 0; i < mark_pools.size(); ++i) {
+ delete mark_pools[i];
+ }
+ mark_pools.clear();
+
+ access_log->stop();
+ delete access_log;
shut_down_logging();
if (stopped) {