*merge from minimal

1 files changed, 0 insertions, 301 deletions

diff --git a/src/libjin/Thread/Thread.cpp b/src/libjin/Thread/Thread.cpp
deleted file mode 100644
index 13e691a..0000000
--- a/src/libjin/Thread/Thread.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-#include "../modules.h"
-#if JIN_MODULES_THREAD
-
-#include "Thread.h"
-
-namespace jin
-{
-namespace thread
-{
-
-    class Mutex
-    {
-    public:
-        Mutex();
-        ~Mutex();
-
-        void lock();
-        void unlock();
-    private:
-    #if JIN_THREAD_SDL
-        SDL_mutex* mutex;
-    #endif 
-        friend class Conditional;
-    };
-
-    // ���������̼߳�signal wait
-    class Conditional
-    {
-    public:
-        Conditional();
-        ~Conditional();
-        void signal();
-        void broadcast();
-        bool wait(Mutex* mutex, int timeout = -1);
-    private:
-    #if JIN_THREAD_SDL
-        SDL_cond* cond;
-    #endif
-    };
-
-    class Lock
-    {
-    public:
-        Lock(Mutex* m) : mutex(m) {
-            mutex->lock();
-        }
-
-        Lock(Mutex& m) : mutex(&m) {
-            mutex->lock();
-        }
-
-        ~Lock() {
-            mutex->unlock();
-        }
-    private:
-        Mutex* mutex;
-
-        Lock(Lock&) {}
-
-    };
-
-    //////////////////////////////////////////////////////////////////////
-    
-    Mutex::Mutex()
-    {
-    #if JIN_THREAD_SDL
-        mutex = SDL_CreateMutex();
-    #endif
-    }
-
-    Mutex::~Mutex()
-    {
-    #if JIN_THREAD_SDL
-        SDL_DestroyMutex(mutex);
-    #endif
-    }
-
-    void Mutex::lock()
-    {
-    #if JIN_THREAD_SDL
-        SDL_LockMutex(mutex);
-    #endif
-    }
-
-    void Mutex::unlock()
-    {
-    #if JIN_THREAD_SDL
-        SDL_UnlockMutex(mutex);
-    #endif
-    }
-
-    //////////////////////////////////////////////////////////////////////
-
-    Conditional::Conditional()
-    {
-    #if JIN_THREAD_SDL
-        cond = SDL_CreateCond();
-    #endif
-    }
-
-    Conditional::~Conditional()
-    {
-    #if JIN_THREAD_SDL
-        SDL_DestroyCond(cond);
-    #endif
-    }
-
-    void Conditional::signal()
-    {
-    #if JIN_THREAD_SDL
-        SDL_CondSignal(cond);
-    #endif
-    }
-
-    void Conditional::broadcast()
-    {
-    #if JIN_THREAD_SDL
-        SDL_CondBroadcast(cond);
-    #endif
-    }
-
-    bool Conditional::wait(Mutex* mutex, int timeout)
-    {
-    #if JIN_THREAD_SDL
-        if (timeout < 0)
-            return !SDL_CondWait(cond, mutex->mutex);
-        else
-            return (SDL_CondWaitTimeout(cond, mutex->mutex, timeout) == 0);
-    #endif
-    }
-    
-    //////////////////////////////////////////////////////////////////////
-
-    Thread::ThreadData::ThreadData(Mutex* m, Conditional* c)
-        : mutex(m)
-        , condition(c)
-        , share()
-    {
-    }
-
-    Thread::ThreadData::~ThreadData()
-    {
-    }
-
-    void Thread::ThreadData::set(int slot, Variant value)
-    {
-        Lock l(mutex);
-        share[slot] = value;
-    }
-
-    Thread::Variant Thread::ThreadData::get(int slot)
-    {
-        Lock l(mutex);
-        return share[slot];
-    }
-
-    bool Thread::ThreadData::exist(int slot)
-    {
-        Lock l(mutex);
-        return share.count(slot) == 1;
-    }
-
-    void Thread::ThreadData::remove(int slot)
-    {
-        Lock l(mutex);
-        if (exist(slot))
-        {
-            share.erase(slot);
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////
-
-    Thread::Thread(const std::string tname, ThreadRunner runner)
-        : name(tname)
-        , running(false)
-        , threadRunner(runner)
-    {
-        mutex = new Mutex();
-        condition = new Conditional();
-        common = new Thread::ThreadData(mutex, condition);
-    }
-
-    Thread::~Thread()
-    {
-    #if JIN_THREAD_SDL
-    #endif
-    }
-
-    const char* Thread::getName()
-    {
-        Lock l(mutex);
-        return name.c_str();
-    };
-    
-    bool Thread::isRunning()
-    {
-        Lock l(mutex);
-        return running;
-    };
-
-    bool Thread::start(void* p)
-    {
-        Lock l(mutex);
-        if (running) 
-            return false;
-        if (handle)
-        {
-        #if JIN_THREAD_SDL
-            SDL_WaitThread(handle, nullptr);
-        #endif
-        }
-    #if JIN_THREAD_SDL
-        handle = SDL_CreateThread(threadRunner, name.c_str(), p);
-    #elif JIN_THREAD_CPP
-        handle = new std::thread();
-    #endif 
-        return (running = (handle != nullptr));
-    }
-
-    void Thread::wait()
-    {
-        {
-            Lock l(mutex);
-            if (!handle)
-                return;
-        }
-    #if JIN_THREAD_SDL
-        SDL_WaitThread(handle, nullptr);
-    #endif
-        Lock l(mutex);
-        running = false; 
-        handle = nullptr;
-    }
-
-    void Thread::lock()
-    {
-        if (mutex != nullptr)
-            mutex->lock();
-    }
-
-    void Thread::unlock()
-    {
-        if (mutex != nullptr)
-            mutex->unlock();
-    }
-
-    void Thread::send(int slot, const Variant& value)
-    {
-        lock(); 
-        common->set(slot, value);
-        unlock();
-        condition->broadcast();
-    }
-
-    bool Thread::receive(int slot)
-    {
-        return common->exist(slot);
-    }
-
-    Thread::Variant Thread::fetch(int slot)
-    {
-        Thread::Variant v = common->get(slot);
-        return v;
-    }
-
-    Thread::Variant Thread::demand(int slot)
-    {
-        /**
-         * pthread_mutex_lock(mtx);
-         * while(pass == 0) 
-         * {
-         *     pthread_mutex_unlock(mtx);
-         *     pthread_cond_just_wait(cv);
-         *     pthread_mutex_lock(mtx);
-         * }
-         * pthread_mutex_unlock(mtx);
-         */
-        lock();
-        while (!common->exist(slot))
-        {
-            if (common->exist(ThreadData::SLOT_ERROR))
-                return 0;
-            condition->wait(mutex);
-        }
-        Thread::Variant v = common->get(slot);
-        unlock();
-        return v;
-    }
-
-    void Thread::remove(int slot)
-    {
-        lock(); 
-        common->remove(slot);
-        unlock();
-    }
-
-} // thread
-} // jin
-
-#endif // JIN_MODULES_THREAD
\ No newline at end of file