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

MXS-2008 Move Worker and MessageQueue to maxbase

Browse Source
This commit is contained in:
Johan Wikman
2018-08-20 13:03:39 +03:00
parent 02ed338afa
commit 88f1795412
29 changed files with 196 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,9 @@
#include <glob.h>
#include <ini.h>
#include <avro/errors.h>
#include <maxscale/alloc.h>
#include <maxbase/atomic.h>
#include <maxbase/worker.hh>
#include <maxscale/alloc.h>
#include <maxscale/dcb.h>
#include <maxscale/log.h>
#include <maxscale/modulecmd.h>
@ -42,7 +43,6 @@
#include <maxscale/spinlock.h>
#include <maxscale/utils.hh>
#include <maxscale/routingworker.h>
#include <maxscale/worker.hh>
#include <binlog_common.h>
#include "avro_converter.hh"

8
server/modules/routing/avrorouter/avro_main.cc
View File

@ -23,8 +23,9 @@
#include <glob.h>
#include <ini.h>
#include <sys/stat.h>
#include <maxscale/alloc.h>
#include <maxbase/atomic.h>
#include <maxbase/worker.hh>
#include <maxscale/alloc.h>
#include <maxscale/dcb.h>
#include <maxscale/log.h>
#include <maxscale/modulecmd.h>
@ -37,12 +38,11 @@
#include <maxscale/spinlock.h>
#include <maxscale/utils.h>
#include <maxscale/routingworker.h>
#include <maxscale/worker.hh>
#include <binlog_common.h>
#include "avro_converter.hh"
using namespace mxs;
using namespace maxbase;
static bool conversion_task_ctl(Avro *inst, bool start);
@ -296,7 +296,7 @@ bool converter_func(Worker::Call::action_t action, Avro* router)
return true;
}
class ConversionCtlTask: public mxs::WorkerDisposableTask
class ConversionCtlTask: public Worker::DisposableTask
{
public:
ConversionCtlTask(Avro* instance, bool start):