[C++] Remove joynr::Thread

Change-Id: Icccc216fe9da2b24ff62c035333fdfb9ec240cd4
bmwcarit · Oct 23, 2018 · f7ba110 · f7ba110
1 parent f46f7f3
commit f7ba110
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 171 deletions.
diff --git a/cpp/libjoynr/CMakeLists.txt b/cpp/libjoynr/CMakeLists.txt
@@ -113,7 +113,6 @@ set(JoynrLib_SOURCES
     "common/concurrency/DelayedScheduler.cpp"
     "common/concurrency/Runnable.cpp"
     "common/concurrency/Semaphore.cpp"
-    "common/concurrency/Thread.cpp"
     "common/concurrency/ThreadPool.cpp"
     "common/concurrency/ThreadPoolDelayedScheduler.cpp"
     "common/InterfaceAddress.cpp"

diff --git a/cpp/libjoynr/common/concurrency/Thread.cpp b/cpp/libjoynr/common/concurrency/Thread.cpp
diff --git a/cpp/libjoynr/include/joynr/Thread.h b/cpp/libjoynr/include/joynr/Thread.h
diff --git a/cpp/libjoynrclustercontroller/http-communication-manager/LongPollingMessageReceiver.cpp b/cpp/libjoynrclustercontroller/http-communication-manager/LongPollingMessageReceiver.cpp
@@ -23,13 +23,14 @@
 #include <cassert>
 #include <cstdint>
 #include <cstdlib>
+#include <thread>
 
 #include <boost/lexical_cast.hpp>
 
 #include "joynr/Future.h"
 #include "joynr/ImmutableMessage.h"
-#include "joynr/Util.h"
 #include "joynr/TimePoint.h"
+#include "joynr/Util.h"
 #include "joynr/system/RoutingTypes/ChannelAddress.h"
 #include "libjoynrclustercontroller/httpnetworking/HttpNetworking.h"
 #include "libjoynrclustercontroller/httpnetworking/HttpResult.h"
@@ -44,8 +45,7 @@ LongPollingMessageReceiver::LongPollingMessageReceiver(
         const LongPollingMessageReceiverSettings& settings,
         std::shared_ptr<Semaphore> channelCreatedSemaphore,
         std::function<void(smrf::ByteVector&&)> onMessageReceived)
-        : Thread("LongPollRecv"),
-          brokerUrl(brokerUrl),
+        : brokerUrl(brokerUrl),
           channelId(channelId),
           receiverId(receiverId),
           settings(settings),
@@ -54,7 +54,8 @@ LongPollingMessageReceiver::LongPollingMessageReceiver(
           interruptedWait(),
           channelCreatedSemaphore(channelCreatedSemaphore),
           onMessageReceived(std::move(onMessageReceived)),
-          currentRequest()
+          currentRequest(),
+          thread(nullptr)
 {
 }
 
@@ -78,10 +79,28 @@ bool LongPollingMessageReceiver::isInterrupted()
     return interrupted;
 }
 
+void LongPollingMessageReceiver::start()
+{
+    if (!thread) {
+        // already started
+        return;
+    }
+
+    thread = std::make_unique<std::thread>(&LongPollingMessageReceiver::run, this);
+    assert(thread != nullptr);
+}
+
 void LongPollingMessageReceiver::stop()
 {
     interrupt();
-    Thread::stop();
+    if (!thread) {
+        return;
+    }
+
+    if (thread->joinable()) {
+        thread->join();
+    }
+    thread.reset();
 }
 
 void LongPollingMessageReceiver::run()

diff --git a/cpp/libjoynrclustercontroller/http-communication-manager/LongPollingMessageReceiver.h b/cpp/libjoynrclustercontroller/http-communication-manager/LongPollingMessageReceiver.h
@@ -30,7 +30,6 @@
 #include "joynr/Logger.h"
 #include "joynr/PrivateCopyAssign.h"
 #include "joynr/Semaphore.h"
-#include "joynr/Thread.h"
 
 namespace joynr
 {
@@ -50,7 +49,7 @@ struct LongPollingMessageReceiverSettings
 /**
  * Class that makes long polling requests to the bounce proxy
  */
-class LongPollingMessageReceiver : public Thread
+class LongPollingMessageReceiver
 {
 public:
     LongPollingMessageReceiver(const BrokerUrl& brokerUrl,
@@ -62,8 +61,9 @@ class LongPollingMessageReceiver : public Thread
 
     ~LongPollingMessageReceiver();
 
-    void stop() override;
-    void run() override;
+    void start();
+    void stop();
+    void run();
     void interrupt();
     bool isInterrupted();
 
@@ -89,6 +89,8 @@ class LongPollingMessageReceiver : public Thread
     /*! On message received callback */
     std::function<void(smrf::ByteVector&&)> onMessageReceived;
     std::unique_ptr<HttpRequest> currentRequest;
+
+    std::unique_ptr<std::thread> thread;
 };
 
 } // namespace joynr