return acceptors;
}
+void create_config_input(const string &src, multimap<string, InputWithRefcount> *inputs)
+{
+ if (src.empty()) {
+ return;
+ }
+ if (inputs->count(src) != 0) {
+ return;
+ }
+
+ 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());
+ return;
+ }
+ iwr.refcount = 0;
+ inputs->insert(make_pair(src, iwr));
+}
+
// Find all streams in the configuration file, and create inputs for them.
void create_config_inputs(const Config &config, multimap<string, InputWithRefcount> *inputs)
{
for (unsigned i = 0; i < config.streams.size(); ++i) {
const StreamConfig &stream_config = config.streams[i];
- if (stream_config.src.empty()) {
- continue;
- }
-
- string src = stream_config.src;
- if (inputs->count(src) != 0) {
- 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;
- }
- iwr.refcount = 0;
- inputs->insert(make_pair(src, iwr));
+ create_config_input(stream_config.src, inputs);
+ }
+ for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
+ const UDPStreamConfig &udpstream_config = config.udpstreams[i];
+ create_config_input(udpstream_config.src, inputs);
}
}
void create_streams(const Config &config,
- const set<string> &deserialized_stream_ids,
+ const set<string> &deserialized_urls,
multimap<string, InputWithRefcount> *inputs)
{
for (unsigned i = 0; i < config.mark_pools.size(); ++i) {
mark_pools.push_back(new MarkPool(mp_config.from, mp_config.to));
}
- set<string> expecting_stream_ids = deserialized_stream_ids;
+ // HTTP streams.
+ set<string> expecting_urls = deserialized_urls;
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,
- Stream::Encoding(stream_config.encoding));
+ int stream_index;
+ if (deserialized_urls.count(stream_config.url) == 0) {
+ stream_index = servers->add_stream(stream_config.url,
+ stream_config.backlog_size,
+ Stream::Encoding(stream_config.encoding));
} else {
- servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
+ stream_index = servers->lookup_stream_by_url(stream_config.url);
+ assert(stream_index != -1);
+ servers->set_backlog_size(stream_index, stream_config.backlog_size);
+ servers->set_encoding(stream_index,
+ Stream::Encoding(stream_config.encoding));
}
- servers->set_encoding(stream_config.stream_id,
- Stream::Encoding(stream_config.encoding));
- expecting_stream_ids.erase(stream_config.stream_id);
+ expecting_urls.erase(stream_config.url);
if (stream_config.mark_pool != -1) {
- servers->set_mark_pool(stream_config.stream_id,
- mark_pools[stream_config.mark_pool]);
+ servers->set_mark_pool(stream_index, 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.input->add_destination(stream_index);
++input_it->second.refcount;
}
}
- // Warn about any servers we've lost.
+ // Warn about any HTTP 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();
+ for (set<string>::const_iterator stream_it = expecting_urls.begin();
+ stream_it != expecting_urls.end();
++stream_it) {
- string stream_id = *stream_it;
+ string url = *stream_it;
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());
+ url.c_str());
+ }
+
+ // UDP streams.
+ for (unsigned i = 0; i < config.udpstreams.size(); ++i) {
+ const UDPStreamConfig &udpstream_config = config.udpstreams[i];
+ MarkPool *mark_pool = NULL;
+ if (udpstream_config.mark_pool != -1) {
+ mark_pool = mark_pools[udpstream_config.mark_pool];
+ }
+ int stream_index = servers->add_udpstream(udpstream_config.dst, mark_pool);
+
+ string src = udpstream_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_index);
+ ++input_it->second.refcount;
+ }
}
}
CubemapStateProto loaded_state;
struct timeval serialize_start;
- set<string> deserialized_stream_ids;
+ set<string> deserialized_urls;
map<int, Acceptor *> deserialized_acceptors;
multimap<string, InputWithRefcount> inputs; // multimap due to older versions without deduplication.
if (state_fd != -1) {
}
servers->add_stream_from_serialized(stream, data_fds);
- deserialized_stream_ids.insert(stream.stream_id());
+ deserialized_urls.insert(stream.url());
}
// Deserialize the inputs. Note that we don't actually add them to any stream yet.
create_config_inputs(config, &inputs);
// Find all streams in the configuration file, create them, and connect to the inputs.
- create_streams(config, deserialized_stream_ids, &inputs);
+ create_streams(config, deserialized_urls, &inputs);
vector<Acceptor *> acceptors = create_acceptors(config, &deserialized_acceptors);
// Put back the existing clients. It doesn't matter which server we
projects / cubemap / blobdiff