oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Clean up threading

Browse source 
* Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
This commit is contained in:
ShadowNinja 2015-04-07 06:13:12 -04:00
parent 6a1047d8c1
commit e4bff8be94
77 changed files with 1594 additions and 2046 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/script/cpp_api/s_async.h
View file

@ -24,9 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <deque>
#include <map>
#include "jthread/jthread.h"
#include "jthread/jmutex.h"
#include "jthread/jsemaphore.h"
#include "threading/thread.h"
#include "threading/mutex.h"
#include "threading/semaphore.h"
#include "debug.h"
#include "lua.h"
#include "cpp_api/s_base.h"
@ -52,24 +52,15 @@ struct LuaJobInfo {
};
// Asynchronous working environment
class AsyncWorkerThread : public JThread, public ScriptApiBase {
class AsyncWorkerThread : public Thread, public ScriptApiBase {
public:
/**
* default constructor
* @param pointer to job dispatcher
*/
AsyncWorkerThread(AsyncEngine* jobDispatcher, unsigned int threadNum);
AsyncWorkerThread(AsyncEngine* jobDispatcher, const std::string &name);
virtual ~AsyncWorkerThread();
void *Thread();
void *run();
private:
AsyncEngine *jobDispatcher;
// Thread number. Used for debug output
unsigned int threadnum;
};
// Asynchornous thread and job management
@ -148,13 +139,13 @@ private:
unsigned int jobIdCounter;
// Mutex to protect job queue
JMutex jobQueueMutex;
Mutex jobQueueMutex;
// Job queue
std::deque<LuaJobInfo> jobQueue;
// Mutex to protect result queue
JMutex resultQueueMutex;
Mutex resultQueueMutex;
// Result queue
std::deque<LuaJobInfo> resultQueue;
@ -162,7 +153,7 @@ private:
std::vector<AsyncWorkerThread*> workerThreads;
// Counter semaphore for job dispatching
JSemaphore jobQueueCounter;
Semaphore jobQueueCounter;
};
#endif // CPP_API_ASYNC_EVENTS_HEADER