diff options
| author | David Robillard <d@drobilla.net> | 2012-08-16 00:59:35 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-08-16 00:59:35 +0000 |
| commit | da4c1fcad194f4f3f399f6a4a731df34567c95ef (patch) | |
| tree | 22c875232a4639f0f80d818e3a399e16c4ffe6ad /src/socket/SocketListener.cpp | |
| parent | d64815e24c043ac87b1504c5f02e93b11c4d8285 (diff) | |
| download | ingen-da4c1fcad194f4f3f399f6a4a731df34567c95ef.tar.gz ingen-da4c1fcad194f4f3f399f6a4a731df34567c95ef.tar.bz2 ingen-da4c1fcad194f4f3f399f6a4a731df34567c95ef.zip | |
Remove Raul::Slave class.
Merge Thread::stop() and Thread::join().
Clean thread shut down without the use of pthread_cancel().
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4708 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/socket/SocketListener.cpp')
| -rw-r--r-- | src/socket/SocketListener.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/socket/SocketListener.cpp b/src/socket/SocketListener.cpp index 936dd0e0..58797fa8 100644 --- a/src/socket/SocketListener.cpp +++ b/src/socket/SocketListener.cpp @@ -65,7 +65,9 @@ SocketListener::SocketListener(Ingen::World& world) SocketListener::~SocketListener() { - stop(); + _exit_flag = true; + _unix_sock.shutdown(); + _net_sock.shutdown(); join(); _unix_sock.close(); _net_sock.close(); @@ -92,10 +94,12 @@ SocketListener::_run() ++nfds; } - while (!_exit_flag) { + while (true) { // Wait for input to arrive at a socket int ret = poll(pfds, nfds, -1); - if (ret == -1) { + if (_exit_flag) { + break; + } else if (ret == -1) { LOG(Raul::error) << "Poll error: " << strerror(errno) << std::endl; break; } else if (ret == 0) { |