summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-07-06 13:44:05 +0100
committerCarl Hetherington <cth@carlh.net>2015-07-06 13:44:05 +0100
commita6e7017b36ea2cee9f95c45fc0a4f85294dbc16f (patch)
tree194ea4fbc52891f16db54b6013fc5e1871fb9a21
parent7ae514af0aea1b953a93f88d5507e6c1dd675908 (diff)
Rename broadcast thread to search thread.
-rw-r--r--src/lib/server_finder.cc10
-rw-r--r--src/lib/server_finder.h6
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index a189ae802..ecda385eb 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -41,11 +41,11 @@ ServerFinder* ServerFinder::_instance = 0;
ServerFinder::ServerFinder ()
: _disabled (false)
- , _broadcast_thread (0)
+ , _search_thread (0)
, _listen_thread (0)
, _stop (false)
{
- _broadcast_thread = new boost::thread (boost::bind (&ServerFinder::broadcast_thread, this));
+ _search_thread = new boost::thread (boost::bind (&ServerFinder::search_thread, this));
_listen_thread = new boost::thread (boost::bind (&ServerFinder::listen_thread, this));
Config::instance()->Changed.connect (boost::bind (&ServerFinder::config_changed, this, _1));
}
@@ -54,15 +54,15 @@ ServerFinder::~ServerFinder ()
{
_stop = true;
- _broadcast_thread->interrupt ();
- _broadcast_thread->join ();
+ _search_thread->interrupt ();
+ _search_thread->join ();
_listen_io_service.stop ();
_listen_thread->join ();
}
void
-ServerFinder::broadcast_thread ()
+ServerFinder::search_thread ()
try
{
boost::system::error_code error;
diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index c43c2a422..22f44eeb8 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -45,7 +45,7 @@ private:
ServerFinder ();
~ServerFinder ();
- void broadcast_thread ();
+ void search_thread ();
void listen_thread ();
bool server_found (std::string) const;
@@ -56,8 +56,8 @@ private:
bool _disabled;
- /** Thread to periodically issue broadcasts to find encoding servers */
- boost::thread* _broadcast_thread;
+ /** Thread to periodically issue broadcasts and requests to find encoding servers */
+ boost::thread* _search_thread;
/** Thread to listen to the responses from servers */
boost::thread* _listen_thread;