TizenRefApp-8204 [Gallery] Redesign ucl::Thread implementation to avoid crashes

Change-Id: I376f7b5655618a0c88c8f410b2e3281f35cb4847

diff --git a/ucl/inc/ucl/util/threading/Thread.h b/ucl/inc/ucl/util/threading/Thread.h
index aad86e8852de33f9a4e0aab7e65b5ecc416a6587..08399217281c80d25c0d0c3d1ff4137e34d4a276 100644 (file)
--- a/ucl/inc/ucl/util/threading/Thread.h
+++ b/ucl/inc/ucl/util/threading/Thread.h
@@ -25,18 +25,24 @@
 
 namespace ucl {
 
-       class Thread : public NonCopyable {
+       class Thread final : public NonCopyable {
        public:
-               explicit Thread(bool createSuspended = false);
-               virtual ~Thread();
+               Thread();
+               template <class FUNC>
+               explicit Thread(FUNC &&func);
+               ~Thread();
+
                bool wasStarted() const;
                bool wasJoinded() const;
-               bool start();
+
+               template <class FUNC>
+               bool start(FUNC &&func);
                void join();
+
                pthread_t *getHandle();
-       protected:
-               virtual void execute() = 0;
+
        private:
+               std::function<void()> m_func;
                pthread_t m_thread;
                bool m_wasStarted;
                bool m_wasJoined;

diff --git a/ucl/inc/ucl/util/threading/Thread.hpp b/ucl/inc/ucl/util/threading/Thread.hpp
index f3d7629133d486d007149a730635e311784cfcb0..74259c15180d96b255f6f4fdbea141414178e751 100644 (file)
--- a/ucl/inc/ucl/util/threading/Thread.hpp
+++ b/ucl/inc/ucl/util/threading/Thread.hpp
@@ -18,14 +18,18 @@
 
 namespace ucl {
 
-       inline Thread::Thread(bool createSuspended) :
+       inline Thread::Thread() :
                m_thread(),
                m_wasStarted(false),
                m_wasJoined(false)
        {
-               if (!createSuspended) {
-                       start();
-               }
+       }
+
+       template <class FUNC>
+       inline Thread::Thread(FUNC &&func) :
+               Thread()
+       {
+               start(func);
        }
 
        inline Thread::~Thread()
@@ -45,21 +49,24 @@ namespace ucl {
                return m_wasJoined;
        }
 
-       inline bool Thread::start()
+       template <class FUNC>
+       inline bool Thread::start(FUNC &&func)
        {
                if (m_wasStarted) {
                        UCL_WLOG("Already started!");
                        return false;
                }
+               m_func = std::forward<FUNC>(func);
                const int res = pthread_create(&m_thread, NULL,
                        [](void *data) -> void *
                        {
-                               static_cast<Thread *>(data)->execute();
+                               static_cast<Thread *>(data)->m_func();
                                return nullptr;
                        },
                        this);
                if (res != 0) {
                        UCL_ELOG("pthread_create() failed: %d", res);
+                       m_func = {};
                        return false;
                }
                m_wasStarted = true;
@@ -78,6 +85,7 @@ namespace ucl {
                }
                m_wasJoined = true;
                pthread_join(m_thread, NULL);
+               m_func = {};
        }
 
        inline pthread_t *Thread::getHandle()

diff --git a/ucl/inc/ucl/util/types/baseTypes.h b/ucl/inc/ucl/util/types/baseTypes.h
index 0d224279a63f0e87f19af23e2839f5c8bad62d91..5b280de6819a865081366583f89909566184d5f9 100644 (file)
--- a/ucl/inc/ucl/util/types/baseTypes.h
+++ b/ucl/inc/ucl/util/types/baseTypes.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <memory>
+#include <functional>
 #include <type_traits>
 #include <utility>