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

MXS-1881: Perform task management in main worker

Browse Source 
The creation and cancellation of delayed tasks must be done on the worker
where the task is executed.
This commit is contained in:
Markus Mäkelä
2018-05-23 14:52:38 +03:00
parent ec919c367b
commit 14a3b0052b
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
server/modules/routing/avrorouter/avro.cc
View File

@ -354,6 +354,34 @@ bool create_tables(sqlite3* handle)
return true; return true;
} }
class ConversionCtlTask: public mxs::WorkerDisposableTask
{
public:
ConversionCtlTask(Avro* instance, bool start):
m_instance(instance),
m_start(start)
{
}
void execute(Worker& worker)
{
if (m_instance->task_handle)
{
worker.cancel_delayed_call(m_instance->task_handle);
m_instance->task_handle = 0;
}
if (m_start)
{
m_instance->task_handle = worker.delayed_call(1000, converter_func, m_instance);
}
}
private:
Avro* m_instance;
bool m_start;
};
static bool conversion_task_ctl(Avro *inst, bool start) static bool conversion_task_ctl(Avro *inst, bool start)
{ {
bool rval = false; bool rval = false;
@ -361,19 +389,13 @@ static bool conversion_task_ctl(Avro *inst, bool start)
if (!inst->service->svc_do_shutdown) if (!inst->service->svc_do_shutdown)
{ {
Worker* worker = static_cast<Worker*>(mxs_rworker_get(MXS_RWORKER_MAIN)); Worker* worker = static_cast<Worker*>(mxs_rworker_get(MXS_RWORKER_MAIN));
std::auto_ptr<ConversionCtlTask> task(new (std::nothrow) ConversionCtlTask(inst, start));
if (inst->task_handle) if (task.get())
{ {
worker->cancel_delayed_call(inst->task_handle); worker->post(task);
inst->task_handle = 0; rval = true;
} }
if (start)
{
inst->task_handle = worker->delayed_call(1000, converter_func, inst);
}
rval = true;
} }
return rval; return rval;