diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-06-26 17:19:39 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-06-27 22:35:35 -0400 |
| commit | 8aa930f28e69f3518831500022988ca2a4b6985d (patch) | |
| tree | 5699c9b0cd8eaa54f4fadf8dcd7d0ba98a9c3c74 /src/jthread | |
| parent | 2c0b51795e6fa6747d881f1871c89830abb6e6e8 (diff) | |
| download | hax-minetest-server-8aa930f28e69f3518831500022988ca2a4b6985d.tar.gz hax-minetest-server-8aa930f28e69f3518831500022988ca2a4b6985d.zip | |
Add minetest.get_mapgen_object to API
Diffstat (limited to 'src/jthread')
| -rw-r--r-- | src/jthread/jthread.h | 1 | ||||
| -rw-r--r-- | src/jthread/pthread/jthread.cpp | 5 | ||||
| -rw-r--r-- | src/jthread/win32/jthread.cpp | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/jthread/jthread.h b/src/jthread/jthread.h index 9440a158d..cd78231e9 100644 --- a/src/jthread/jthread.h +++ b/src/jthread/jthread.h @@ -47,6 +47,7 @@ public: virtual void *Thread() = 0; bool IsRunning(); void *GetReturnValue(); + bool IsSameThread(); protected: void ThreadStarted(); private: diff --git a/src/jthread/pthread/jthread.cpp b/src/jthread/pthread/jthread.cpp index 978cac20a..4a5c736eb 100644 --- a/src/jthread/pthread/jthread.cpp +++ b/src/jthread/pthread/jthread.cpp @@ -148,6 +148,11 @@ void *JThread::GetReturnValue() return val; } +bool JThread::IsSameThread() +{ + return pthread_equal(pthread_self(), threadid); +} + void *JThread::TheThread(void *param) { JThread *jthread; diff --git a/src/jthread/win32/jthread.cpp b/src/jthread/win32/jthread.cpp index 54b110bfd..c07425dca 100644 --- a/src/jthread/win32/jthread.cpp +++ b/src/jthread/win32/jthread.cpp @@ -141,6 +141,11 @@ void *JThread::GetReturnValue() return val; } +bool JThread::IsSameThread() +{ + return GetCurrentThreadId() == threadid; +} + #ifndef _WIN32_WCE UINT __stdcall JThread::TheThread(void *param) #else |