improving ThreadLoader and ThreadDispatcher

oxygine/src/ThreadLoader.cpp

@@ -12,8 +12,8 @@ namespace oxygine
 
     ThreadLoader::~ThreadLoader()
     {
-        //if (!pthread_equal(_thread, pthread_self()))
-        //  pthread_join(_thread, 0);
+        if (!pthread_equal(_thread, pthread_self()))
+            pthread_join(_thread, 0);
     }
 
 
@@ -27,6 +27,11 @@ namespace oxygine
         _ress.push_back(res);
     }
 
+    void ThreadLoader::add(std::function< void() > v)
+    {
+        _funcs.push_back(v);
+    }
+
     bool ThreadLoader::isCompleted()
     {
         return _threadDone;
@@ -84,6 +89,11 @@ namespace oxygine
             res->load();
         }
 
+        for (funcs::iterator i = _funcs.begin(); i != _funcs.end(); ++i)
+        {
+            (*i)();
+        }
+
         core::getMainThreadDispatcher().postCallback(0, 0, 0, threadDone, this);
     }
 
@@ -91,6 +101,10 @@ namespace oxygine
     {
         _threadDone = false;
         addRef();
-        pthread_create(&_thread, 0, _staticThreadFunc, this);
+
+        pthread_attr_t attr;
+        pthread_attr_init(&attr);
+        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+        pthread_create(&_thread, &attr, _staticThreadFunc, this);
     }
 }

oxygine/src/ThreadLoader.h

@@ -3,6 +3,7 @@
 #include "EventDispatcher.h"
 #include "pthread.h"
 #include "core/ThreadDispatcher.h"
+#include <functional>
 
 namespace oxygine
 {
@@ -26,6 +27,8 @@ namespace oxygine
         virtual void add(Resources* res);
         virtual void add(Resource* res);
 
+        virtual void add(std::function< void() >);
+
         void start();
         //void stop();
 
@@ -45,5 +48,8 @@ namespace oxygine
 
         typedef std::list<Resource*> ress;
         ress _ress;
+
+        typedef std::list<std::function<void()> > funcs;
+        funcs _funcs;
     };
 }

oxygine/src/core/ThreadDispatcher.cpp

@@ -100,6 +100,38 @@ namespace oxygine
         _popMessage(ev);
     }
 
+
+    void ThreadDispatcher::get2(message& ev)
+    {
+        {
+            MutexPthreadLock lock(_mutex);
+            LOGDN("get2");
+            _waitMessage();
+
+            _last = _events.front();
+            _events.erase(_events.begin());
+        }
+
+
+        if (_last.cb)
+        {
+            LOGDN("running callback for id=%d", _last._id);
+            _last.cb(_last);
+            _last.cb = 0;
+        }
+
+#ifndef __S3E__
+        if (_last.cbFunction)
+        {
+            LOGDN("running callback function for id=%d", _last._id);
+            _last.cbFunction();
+            _last.cbFunction = std::function< void() >();
+        }
+#endif
+
+    }
+
+
     bool ThreadDispatcher::empty()
     {
         MutexPthreadLock lock(_mutex);

oxygine/src/core/ThreadDispatcher.h

@@ -66,6 +66,9 @@ namespace oxygine
         //blocking
         void get(message& ev);
 
+        //test
+        void get2(message& ev);
+
         bool peek(peekMessage& ev, bool del);
         void clear();
 
@@ -100,6 +103,7 @@ namespace oxygine
         void _pushMessage(message&);
         void _pushMessageWaitReply(message&);
         void _popMessage(message&);
+        void _popMessageNoCB(message&);
         void _replyLast(void* val);
         unsigned int _id;
         void*   _result;

oxygine/src/res/CreateResourceContext.cpp

@@ -228,6 +228,7 @@ namespace oxygine
     void MTLoadingResourcesContext::createTexture(const CreateTextureTask& opt)
     {
         core::getMainThreadDispatcher().sendCallback(0, 0, copyTexture, (void*)&opt);
+        //core::getMainThreadDispatcher().postCallback(0, 0, 0, copyTexture, (void*)&opt);
     }
 
     bool MTLoadingResourcesContext::isNeedProceed(spNativeTexture t)