Fix race condition in thread creation

Wiebe Cazemier
1 parent 260643dc
Showing 3 changed files with 6 additions and 5 deletions
mainapp.cpp
threaddata.cpp
threaddata.h
@@ -252,8 +252,7 @@ void MainApp::start()
     for (int i = 0; i < NR_OF_THREADS; i++)
     {
         std::shared_ptr<ThreadData> t(new ThreadData(i, subscriptionStore, *confFileParser.get()));
-        std::thread thread(do_thread_work, t.get());
-        t->moveThreadHere(std::move(thread));
+        t->start(&do_thread_work);
         threads.push_back(t);
     }
@@ -13,9 +13,9 @@ ThreadData::ThreadData(int threadnr, std::shared_ptr&lt;SubscriptionStore&gt; &amp;subscri
     epollfd = check<std::runtime_error>(epoll_create(999));
 }
-void ThreadData::moveThreadHere(std::thread &&thread)
+void ThreadData::start(thread_f f)
 {
-    this->thread = std::move(thread);
+    this->thread = std::thread(f, this);
     pthread_t native = this->thread.native_handle();
     std::ostringstream threadName;
@@ -20,6 +20,8 @@
 #include "authplugin.h"
 #include "logger.h"
+typedef void (*thread_f)(ThreadData *);
+
 class ThreadData
 {
     std::unordered_map<int, Client_p> clients_by_fd;
@@ -39,7 +41,7 @@ public:
     ThreadData(const ThreadData &other) = delete;
     ThreadData(ThreadData &&other) = delete;
-    void moveThreadHere(std::thread &&thread);
+    void start(thread_f f);
     void quit();
     void giveClient(Client_p client);
     Client_p getClient(int fd);