hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add direct mode to Worker::execute()

Browse Source 
Sometimes that's what you want, but primarily for completeness'
sake and it makes AUTO more sensical as it essentially chooses
beteen DIRECT and QUEUED mode.
This commit is contained in:
Johan Wikman
2019-01-31 10:04:55 +02:00
parent 556ea552aa
commit b18467e17e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maxutils/maxbase/include/maxbase/worker.hh
View File

@ -306,8 +306,9 @@ public:
enum execute_mode_t enum execute_mode_t
{ {
EXECUTE_AUTO, /**< Execute tasks immediately */ EXECUTE_DIRECT, /**< Always execute directly using the calling thread/worker. */
EXECUTE_QUEUED /**< Only queue tasks for execution */ EXECUTE_QUEUED, /**< Always execute via the event loop using this thread/worker. */
EXECUTE_AUTO, /**< If calling thread/worker is this worker, call directly otherwise queued. */
}; };
struct Call struct Call

6
maxutils/maxbase/src/worker.cc
View File

@ -414,7 +414,8 @@ bool Worker::execute(Task* pTask, mxb::Semaphore* pSem, enum execute_mode_t mode
// No logging here, function must be signal safe. // No logging here, function must be signal safe.
bool rval = true; bool rval = true;
if (mode == Worker::EXECUTE_AUTO && Worker::get_current() == this) if ((mode == Worker::EXECUTE_DIRECT)
|| (mode == Worker::EXECUTE_AUTO && Worker::get_current() == this))
{ {
pTask->execute(*this); pTask->execute(*this);
@ -447,7 +448,8 @@ bool Worker::post_disposable(DisposableTask* pTask, enum execute_mode_t mode)
pTask->inc_ref(); pTask->inc_ref();
if (mode == Worker::EXECUTE_AUTO && Worker::get_current() == this) if ((mode == Worker::EXECUTE_DIRECT)
|| (mode == Worker::EXECUTE_AUTO && Worker::get_current() == this))
{ {
pTask->execute(*this); pTask->execute(*this);
pTask->dec_ref(); pTask->dec_ref();