wsd: remove sockets when stopping poll thread

And assume correct thread if poll thread is
not running (i.e. no race).

Change-Id: I17958e682aba434ebb47fe0de199b9f530b54dee
Reviewed-on: https://gerrit.libreoffice.org/36183
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/net/Socket.hpp b/net/Socket.hpp
index ad59bbfb0..cd1ea6cc4 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -264,7 +264,23 @@ public:
     /// Stop the polling thread.
     void stop()
     {
+        LOG_DBG("Stopping " << _name << " and removing all sockets.");
         _stop = true;
+
+        assert(socket);
+        assertCorrectThread();
+
+        while (!_pollSockets.empty())
+        {
+            const std::shared_ptr<Socket>& socket = _pollSockets.back();
+
+            LOG_DBG("Removing socket #" << socket->getFD() << " from " << _name);
+            socket->assertCorrectThread();
+            socket->setThreadOwner(std::thread::id(0));
+
+            _pollSockets.pop_back();
+        }
+
         wakeup();
     }