diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-20 10:47:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-20 10:47:49 +0100 |
| commit | 57d00c880094b1dfebaee18f4ecafb1dd44b0afb (patch) | |
| tree | db9d5a1bcc6be5a99afa1bd317a1c27930eaefbb /src/lib/encode_server_finder.cc | |
| parent | b34310b4e90af1442363fe09db082d68e1721130 (diff) | |
Do EncodeServerFinder 'disable' in a more sensible way.
Just stop the threads and clear the server list when
stop() is called.
Diffstat (limited to 'src/lib/encode_server_finder.cc')
| -rw-r--r-- | src/lib/encode_server_finder.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/lib/encode_server_finder.cc b/src/lib/encode_server_finder.cc index eebf404fa..135a8bce8 100644 --- a/src/lib/encode_server_finder.cc +++ b/src/lib/encode_server_finder.cc @@ -43,8 +43,7 @@ using boost::weak_ptr; EncodeServerFinder* EncodeServerFinder::_instance = 0; EncodeServerFinder::EncodeServerFinder () - : _disabled (false) - , _search_thread (0) + : _search_thread (0) , _listen_thread (0) , _stop (false) { @@ -58,8 +57,15 @@ EncodeServerFinder::start () _listen_thread = new boost::thread (boost::bind (&EncodeServerFinder::listen_thread, this)); } + EncodeServerFinder::~EncodeServerFinder () { + stop (); +} + +void +EncodeServerFinder::stop () +{ _stop = true; _search_condition.notify_all (); @@ -71,6 +77,8 @@ EncodeServerFinder::~EncodeServerFinder () _search_thread->join (); } } + delete _search_thread; + _search_thread = 0; _listen_io_service.stop (); if (_listen_thread) { @@ -81,6 +89,11 @@ EncodeServerFinder::~EncodeServerFinder () _listen_thread->join (); } } + delete _listen_thread; + _listen_thread = 0; + + boost::mutex::scoped_lock lm (_servers_mutex); + _servers.clear (); } void |