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

MXS-2002 Worker::execute() renamed to Worker::call()

Browse Source 
In preparation for Worker::post() to be renamed to Worker:execute().
The concept of _posting_ will be reserved to mean the transfer of
something over the message queue to the worker for processing and
nothing else.
This commit is contained in:
Johan Wikman
2018-08-09 14:59:48 +03:00
parent 6335d3776c
commit 3013adb14f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/worker.hh
View File

@ -771,7 +771,7 @@ public:
* *
* @return True if function was executed on the worker * @return True if function was executed on the worker
*/ */
bool execute(GenericFunction func, enum execute_mode_t mode); bool call(GenericFunction func, enum execute_mode_t mode);
/** /**
* Post a message to a worker. * Post a message to a worker.

2
server/core/worker.cc
View File

@ -516,7 +516,7 @@ bool Worker::post(GenericFunction func, Semaphore* pSem, execute_mode_t mode)
return rval; return rval;
} }
bool Worker::execute(GenericFunction func, execute_mode_t mode) bool Worker::call(GenericFunction func, execute_mode_t mode)
{ {
Semaphore sem; Semaphore sem;
return post(func, &sem, mode) && sem.wait(); return post(func, &sem, mode) && sem.wait();

4
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -263,7 +263,7 @@ void MariaDBMonitor::diagnostics(DCB *dcb) const
diag_str = diagnostics_to_string(); diag_str = diagnostics_to_string();
}; };
if (!mutable_ptr->execute(func, Worker::EXECUTE_AUTO)) if (!mutable_ptr->call(func, Worker::EXECUTE_AUTO))
{ {
diag_str = DIAG_ERROR; diag_str = DIAG_ERROR;
} }
@ -310,7 +310,7 @@ json_t* MariaDBMonitor::diagnostics_json() const
rval = diagnostics_to_json(); rval = diagnostics_to_json();
}; };
if (!mutable_ptr->execute(func, Worker::EXECUTE_AUTO)) if (!mutable_ptr->call(func, Worker::EXECUTE_AUTO))
{ {
rval = mxs_json_error_append(rval, "%s", DIAG_ERROR); rval = mxs_json_error_append(rval, "%s", DIAG_ERROR);
} }