_listen_thread = 0;
boost::mutex::scoped_lock lm (_servers_mutex);
- _good_servers.clear ();
- _bad_servers.clear ();
-}
-
-static bool
-remove_missing (list<EncodeServerDescription>& servers, int since)
-{
- bool removed = false;
- list<EncodeServerDescription>::iterator i = servers.begin();
- while (i != servers.end()) {
- if (i->last_seen_seconds() > since) {
- list<EncodeServerDescription>::iterator j = i;
- ++j;
- servers.erase (i);
- i = j;
- removed = true;
- } else {
- ++i;
- }
- }
- return removed;
+ _servers.clear ();
}
void
}
/* Discard servers that we haven't seen for a while */
+ bool removed = false;
{
boost::mutex::scoped_lock lm (_servers_mutex);
- bool g = remove_missing(_good_servers, 2 * interval);
- bool b = remove_missing(_bad_servers, 2 * interval);
- if (g || b) {
- emit (boost::bind (boost::ref (ServersListChanged)));
+
+ list<EncodeServerDescription>::iterator i = _servers.begin();
+ while (i != _servers.end()) {
+ if (i->last_seen_seconds() > 2 * interval) {
+ list<EncodeServerDescription>::iterator j = i;
+ ++j;
+ _servers.erase (i);
+ i = j;
+ removed = true;
+ } else {
+ ++i;
+ }
}
}
+ if (removed) {
+ emit (boost::bind (boost::ref (ServersListChanged)));
+ }
+
boost::mutex::scoped_lock lm (_search_condition_mutex);
_search_condition.timed_wait (lm, boost::get_system_time() + boost::posix_time::seconds (interval));
}
(*found)->set_seen ();
} else {
EncodeServerDescription sd (ip, xml->number_child<int>("Threads"), xml->optional_number_child<int>("Version").get_value_or(0));
- if (sd.link_version() == SERVER_LINK_VERSION) {
- boost::mutex::scoped_lock lm (_servers_mutex);
- _good_servers.push_back (sd);
- } else {
+ {
boost::mutex::scoped_lock lm (_servers_mutex);
- _bad_servers.push_back (sd);
+ _servers.push_back (sd);
}
emit (boost::bind (boost::ref (ServersListChanged)));
}
EncodeServerFinder::server_found (string ip)
{
boost::mutex::scoped_lock lm (_servers_mutex);
- list<EncodeServerDescription>::iterator i = _good_servers.begin();
- while (i != _good_servers.end() && i->host_name() != ip) {
+ list<EncodeServerDescription>::iterator i = _servers.begin();
+ while (i != _servers.end() && i->host_name() != ip) {
++i;
}
- if (i != _good_servers.end()) {
- return i;
- }
-
- i = _bad_servers.begin();
- while (i != _bad_servers.end() && i->host_name() != ip) {
- ++i;
- }
-
- if (i != _bad_servers.end()) {
+ if (i != _servers.end()) {
return i;
}
}
list<EncodeServerDescription>
-EncodeServerFinder::good_servers () const
-{
- boost::mutex::scoped_lock lm (_servers_mutex);
- return _good_servers;
-}
-
-list<EncodeServerDescription>
-EncodeServerFinder::bad_servers () const
+EncodeServerFinder::servers () const
{
boost::mutex::scoped_lock lm (_servers_mutex);
- return _bad_servers;
+ return _servers;
}
void
if (what == Config::USE_ANY_SERVERS || what == Config::SERVERS) {
{
boost::mutex::scoped_lock lm (_servers_mutex);
- _good_servers.clear ();
- _bad_servers.clear ();
+ _servers.clear ();
}
ServersListChanged ();
_search_condition.notify_all ();