From 396b81f336ec7448b082ca5a7dc6e21118467bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 22 Nov 2017 08:12:09 +0200 Subject: [PATCH] Fix in-source builds The internal header directory conflicted with in-source builds causing a build failure. This is fixed by renaming the internal header directory to something other than maxscale. The renaming pointed out a few problems in a couple of source files that appeared to include internal headers when the headers were in fact public headers. Fixed maxctrl in-source builds by making the copying of the sources optional. --- maxctrl/build.sh | 10 ++++++++-- server/core/admin.cc | 4 ++-- server/core/authenticator.cc | 2 +- server/core/config.cc | 12 +++++------ server/core/config_runtime.cc | 10 +++++----- server/core/dcb.cc | 12 +++++------ server/core/externcmd.cc | 2 +- server/core/filter.cc | 6 +++--- server/core/gateway.cc | 20 +++++++++---------- server/core/httprequest.cc | 4 ++-- server/core/httpresponse.cc | 4 ++-- server/core/{maxscale => internal}/admin.hh | 0 server/core/{maxscale => internal}/config.h | 0 .../{maxscale => internal}/config_runtime.h | 0 server/core/{maxscale => internal}/dcb.h | 0 .../core/{maxscale => internal}/externcmd.h | 0 server/core/{maxscale => internal}/filter.h | 0 .../{maxscale => internal}/httprequest.hh | 0 .../{maxscale => internal}/httpresponse.hh | 0 server/core/{maxscale => internal}/maxscale.h | 0 .../{maxscale => internal}/messagequeue.hh | 0 server/core/{maxscale => internal}/mlist.h | 0 server/core/{maxscale => internal}/modules.h | 0 server/core/{maxscale => internal}/monitor.h | 0 server/core/{maxscale => internal}/poll.h | 0 .../{maxscale => internal}/query_classifier.h | 0 .../core/{maxscale => internal}/resource.hh | 0 server/core/{maxscale => internal}/secrets.h | 0 server/core/{maxscale => internal}/service.h | 0 server/core/{maxscale => internal}/session.h | 0 server/core/{maxscale => internal}/session.hh | 0 .../core/{maxscale => internal}/skygw_utils.h | 0 .../core/{maxscale => internal}/statistics.h | 0 .../trxboundaryparser.hh | 0 server/core/{maxscale => internal}/worker.h | 0 server/core/{maxscale => internal}/worker.hh | 0 .../core/{maxscale => internal}/workertask.hh | 0 server/core/load_utils.cc | 6 +++--- server/core/log_manager.cc | 2 +- server/core/maxkeys.c | 2 +- server/core/maxpasswd.c | 2 +- server/core/messagequeue.cc | 4 ++-- server/core/misc.cc | 2 +- server/core/mlist.cc | 2 +- server/core/modulecmd.cc | 4 ++-- server/core/monitor.cc | 10 +++++----- server/core/poll.cc | 4 ++-- server/core/query_classifier.cc | 6 +++--- server/core/resource.cc | 20 +++++++++---------- server/core/secrets.cc | 2 +- server/core/server.cc | 8 ++++---- server/core/service.cc | 8 ++++---- server/core/session.cc | 10 +++++----- server/core/skygw_utils.cc | 2 +- server/core/statistics.cc | 2 +- server/core/test/profile_trxboundaryparser.cc | 2 +- server/core/test/test_dcb.cc | 4 ++-- server/core/test/test_filter.cc | 2 +- server/core/test/test_log.cc | 2 +- server/core/test/test_modulecmd.cc | 2 +- server/core/test/test_service.cc | 2 +- server/core/test/test_trxcompare.cc | 2 +- server/core/test/test_trxtracking.cc | 2 +- server/core/test/test_utils.h | 6 +++--- server/core/worker.cc | 12 +++++------ server/core/workertask.cc | 2 +- server/modules/filter/test/filtermodule.cc | 4 ++-- server/modules/filter/test/module.cc | 4 ++-- server/modules/monitor/mysqlmon/mysql_mon.cc | 2 +- .../modules/protocol/MySQL/mariadb_client.cc | 2 +- .../routing/binlogrouter/test/testbinlog.c | 2 +- server/modules/routing/debugcli/debugcmd.c | 12 +++++------ server/modules/routing/maxinfo/maxinfo.c | 8 ++++---- server/modules/routing/maxinfo/maxinfo_exec.c | 10 +++++----- 74 files changed, 135 insertions(+), 129 deletions(-) rename server/core/{maxscale => internal}/admin.hh (100%) rename server/core/{maxscale => internal}/config.h (100%) rename server/core/{maxscale => internal}/config_runtime.h (100%) rename server/core/{maxscale => internal}/dcb.h (100%) rename server/core/{maxscale => internal}/externcmd.h (100%) rename server/core/{maxscale => internal}/filter.h (100%) rename server/core/{maxscale => internal}/httprequest.hh (100%) rename server/core/{maxscale => internal}/httpresponse.hh (100%) rename server/core/{maxscale => internal}/maxscale.h (100%) rename server/core/{maxscale => internal}/messagequeue.hh (100%) rename server/core/{maxscale => internal}/mlist.h (100%) rename server/core/{maxscale => internal}/modules.h (100%) rename server/core/{maxscale => internal}/monitor.h (100%) rename server/core/{maxscale => internal}/poll.h (100%) rename server/core/{maxscale => internal}/query_classifier.h (100%) rename server/core/{maxscale => internal}/resource.hh (100%) rename server/core/{maxscale => internal}/secrets.h (100%) rename server/core/{maxscale => internal}/service.h (100%) rename server/core/{maxscale => internal}/session.h (100%) rename server/core/{maxscale => internal}/session.hh (100%) rename server/core/{maxscale => internal}/skygw_utils.h (100%) rename server/core/{maxscale => internal}/statistics.h (100%) rename server/core/{maxscale => internal}/trxboundaryparser.hh (100%) rename server/core/{maxscale => internal}/worker.h (100%) rename server/core/{maxscale => internal}/worker.hh (100%) rename server/core/{maxscale => internal}/workertask.hh (100%) diff --git a/maxctrl/build.sh b/maxctrl/build.sh index 9beb4c396..75126b93e 100755 --- a/maxctrl/build.sh +++ b/maxctrl/build.sh @@ -6,9 +6,15 @@ then exit 1 fi -# Copy sources to working directory src=$1 -cp -r -t $PWD/maxctrl $src/maxctrl/* && cd $PWD/maxctrl + +if [ "$PWD" != "$src" ] +then + # Copy sources to working directory + cp -r -t $PWD/maxctrl $src/maxctrl/* +fi + +cd $PWD/maxctrl npm install npm install pkg@4.2.3 diff --git a/server/core/admin.cc b/server/core/admin.cc index 16915e682..a8e14d1ed 100644 --- a/server/core/admin.cc +++ b/server/core/admin.cc @@ -14,7 +14,7 @@ /** * @file The embedded HTTP protocol administrative interface */ -#include "maxscale/admin.hh" +#include "internal/admin.hh" #include #include @@ -35,7 +35,7 @@ #include #include -#include "maxscale/resource.hh" +#include "internal/resource.hh" using std::string; using std::ifstream; diff --git a/server/core/authenticator.cc b/server/core/authenticator.cc index 9c54080ba..0bf04df1f 100644 --- a/server/core/authenticator.cc +++ b/server/core/authenticator.cc @@ -15,7 +15,7 @@ #include #include -#include "maxscale/modules.h" +#include "internal/modules.h" /** * @file authenticator.c - Authenticator module functions */ diff --git a/server/core/config.cc b/server/core/config.cc index a4c6aba0d..32225139a 100644 --- a/server/core/config.cc +++ b/server/core/config.cc @@ -39,18 +39,18 @@ #include #include #include +#include #include #include #include #include #include -#include "maxscale/config.h" -#include "maxscale/filter.h" -#include "maxscale/service.h" -#include "maxscale/monitor.h" -#include "maxscale/modules.h" -#include "maxscale/router.h" +#include "internal/config.h" +#include "internal/filter.h" +#include "internal/service.h" +#include "internal/monitor.h" +#include "internal/modules.h" using std::set; using std::string; diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc index d6507d5be..71135f33e 100644 --- a/server/core/config_runtime.cc +++ b/server/core/config_runtime.cc @@ -13,7 +13,7 @@ #include -#include "maxscale/config_runtime.h" +#include "internal/config_runtime.h" #include #include @@ -31,10 +31,10 @@ #include #include -#include "maxscale/config.h" -#include "maxscale/monitor.h" -#include "maxscale/modules.h" -#include "maxscale/service.h" +#include "internal/config.h" +#include "internal/monitor.h" +#include "internal/modules.h" +#include "internal/service.h" typedef std::set StringSet; diff --git a/server/core/dcb.cc b/server/core/dcb.cc index 9c1c55814..edffa8b74 100644 --- a/server/core/dcb.cc +++ b/server/core/dcb.cc @@ -20,7 +20,7 @@ * the state data and pointers to other components that relate to the * use of a file descriptor. */ -#include "maxscale/dcb.h" +#include "internal/dcb.h" #include #include @@ -54,12 +54,12 @@ #include #include #include +#include -#include "maxscale/modules.h" -#include "maxscale/semaphore.hh" -#include "maxscale/session.h" -#include "maxscale/worker.hh" -#include "maxscale/workertask.hh" +#include "internal/modules.h" +#include "internal/session.h" +#include "internal/worker.hh" +#include "internal/workertask.hh" using maxscale::Worker; using maxscale::WorkerTask; diff --git a/server/core/externcmd.cc b/server/core/externcmd.cc index 74c320ff0..6a0a3dfae 100644 --- a/server/core/externcmd.cc +++ b/server/core/externcmd.cc @@ -11,7 +11,7 @@ * Public License. */ -#include "maxscale/externcmd.h" +#include "internal/externcmd.h" #include #include diff --git a/server/core/filter.cc b/server/core/filter.cc index 68711a591..498825a6d 100644 --- a/server/core/filter.cc +++ b/server/core/filter.cc @@ -15,7 +15,7 @@ * @file filter.c - A representation of a filter within MaxScale. */ -#include "maxscale/filter.h" +#include "internal/filter.h" #include #include @@ -32,8 +32,8 @@ #include #include -#include "maxscale/config.h" -#include "maxscale/modules.h" +#include "internal/config.h" +#include "internal/modules.h" using std::string; using std::set; diff --git a/server/core/gateway.cc b/server/core/gateway.cc index 95fb54887..c1197c266 100644 --- a/server/core/gateway.cc +++ b/server/core/gateway.cc @@ -51,16 +51,16 @@ #include #include -#include "maxscale/config.h" -#include "maxscale/maxscale.h" -#include "maxscale/messagequeue.hh" -#include "maxscale/modules.h" -#include "maxscale/monitor.h" -#include "maxscale/poll.h" -#include "maxscale/service.h" -#include "maxscale/statistics.h" -#include "maxscale/admin.hh" -#include "maxscale/worker.hh" +#include "internal/config.h" +#include "internal/maxscale.h" +#include "internal/messagequeue.hh" +#include "internal/modules.h" +#include "internal/monitor.h" +#include "internal/poll.h" +#include "internal/service.h" +#include "internal/statistics.h" +#include "internal/admin.hh" +#include "internal/worker.hh" using namespace maxscale; diff --git a/server/core/httprequest.cc b/server/core/httprequest.cc index 005b19067..a6b50b67b 100644 --- a/server/core/httprequest.cc +++ b/server/core/httprequest.cc @@ -11,8 +11,8 @@ * Public License. */ -#include "maxscale/httprequest.hh" -#include "maxscale/admin.hh" +#include "internal/httprequest.hh" +#include "internal/admin.hh" #include #include diff --git a/server/core/httpresponse.cc b/server/core/httpresponse.cc index aee90ef67..b5cfd0a3a 100644 --- a/server/core/httpresponse.cc +++ b/server/core/httpresponse.cc @@ -11,7 +11,7 @@ * Public License. */ -#include "maxscale/httpresponse.hh" +#include "internal/httpresponse.hh" #include #include @@ -19,7 +19,7 @@ #include #include -#include "maxscale/admin.hh" +#include "internal/admin.hh" using std::string; using std::stringstream; diff --git a/server/core/maxscale/admin.hh b/server/core/internal/admin.hh similarity index 100% rename from server/core/maxscale/admin.hh rename to server/core/internal/admin.hh diff --git a/server/core/maxscale/config.h b/server/core/internal/config.h similarity index 100% rename from server/core/maxscale/config.h rename to server/core/internal/config.h diff --git a/server/core/maxscale/config_runtime.h b/server/core/internal/config_runtime.h similarity index 100% rename from server/core/maxscale/config_runtime.h rename to server/core/internal/config_runtime.h diff --git a/server/core/maxscale/dcb.h b/server/core/internal/dcb.h similarity index 100% rename from server/core/maxscale/dcb.h rename to server/core/internal/dcb.h diff --git a/server/core/maxscale/externcmd.h b/server/core/internal/externcmd.h similarity index 100% rename from server/core/maxscale/externcmd.h rename to server/core/internal/externcmd.h diff --git a/server/core/maxscale/filter.h b/server/core/internal/filter.h similarity index 100% rename from server/core/maxscale/filter.h rename to server/core/internal/filter.h diff --git a/server/core/maxscale/httprequest.hh b/server/core/internal/httprequest.hh similarity index 100% rename from server/core/maxscale/httprequest.hh rename to server/core/internal/httprequest.hh diff --git a/server/core/maxscale/httpresponse.hh b/server/core/internal/httpresponse.hh similarity index 100% rename from server/core/maxscale/httpresponse.hh rename to server/core/internal/httpresponse.hh diff --git a/server/core/maxscale/maxscale.h b/server/core/internal/maxscale.h similarity index 100% rename from server/core/maxscale/maxscale.h rename to server/core/internal/maxscale.h diff --git a/server/core/maxscale/messagequeue.hh b/server/core/internal/messagequeue.hh similarity index 100% rename from server/core/maxscale/messagequeue.hh rename to server/core/internal/messagequeue.hh diff --git a/server/core/maxscale/mlist.h b/server/core/internal/mlist.h similarity index 100% rename from server/core/maxscale/mlist.h rename to server/core/internal/mlist.h diff --git a/server/core/maxscale/modules.h b/server/core/internal/modules.h similarity index 100% rename from server/core/maxscale/modules.h rename to server/core/internal/modules.h diff --git a/server/core/maxscale/monitor.h b/server/core/internal/monitor.h similarity index 100% rename from server/core/maxscale/monitor.h rename to server/core/internal/monitor.h diff --git a/server/core/maxscale/poll.h b/server/core/internal/poll.h similarity index 100% rename from server/core/maxscale/poll.h rename to server/core/internal/poll.h diff --git a/server/core/maxscale/query_classifier.h b/server/core/internal/query_classifier.h similarity index 100% rename from server/core/maxscale/query_classifier.h rename to server/core/internal/query_classifier.h diff --git a/server/core/maxscale/resource.hh b/server/core/internal/resource.hh similarity index 100% rename from server/core/maxscale/resource.hh rename to server/core/internal/resource.hh diff --git a/server/core/maxscale/secrets.h b/server/core/internal/secrets.h similarity index 100% rename from server/core/maxscale/secrets.h rename to server/core/internal/secrets.h diff --git a/server/core/maxscale/service.h b/server/core/internal/service.h similarity index 100% rename from server/core/maxscale/service.h rename to server/core/internal/service.h diff --git a/server/core/maxscale/session.h b/server/core/internal/session.h similarity index 100% rename from server/core/maxscale/session.h rename to server/core/internal/session.h diff --git a/server/core/maxscale/session.hh b/server/core/internal/session.hh similarity index 100% rename from server/core/maxscale/session.hh rename to server/core/internal/session.hh diff --git a/server/core/maxscale/skygw_utils.h b/server/core/internal/skygw_utils.h similarity index 100% rename from server/core/maxscale/skygw_utils.h rename to server/core/internal/skygw_utils.h diff --git a/server/core/maxscale/statistics.h b/server/core/internal/statistics.h similarity index 100% rename from server/core/maxscale/statistics.h rename to server/core/internal/statistics.h diff --git a/server/core/maxscale/trxboundaryparser.hh b/server/core/internal/trxboundaryparser.hh similarity index 100% rename from server/core/maxscale/trxboundaryparser.hh rename to server/core/internal/trxboundaryparser.hh diff --git a/server/core/maxscale/worker.h b/server/core/internal/worker.h similarity index 100% rename from server/core/maxscale/worker.h rename to server/core/internal/worker.h diff --git a/server/core/maxscale/worker.hh b/server/core/internal/worker.hh similarity index 100% rename from server/core/maxscale/worker.hh rename to server/core/internal/worker.hh diff --git a/server/core/maxscale/workertask.hh b/server/core/internal/workertask.hh similarity index 100% rename from server/core/maxscale/workertask.hh rename to server/core/internal/workertask.hh diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc index 2884ff143..3ef9f0761 100644 --- a/server/core/load_utils.cc +++ b/server/core/load_utils.cc @@ -15,7 +15,7 @@ * @file load_utils.c Utility functions for loading of modules */ -#include "maxscale/modules.h" +#include "internal/modules.h" #include #include @@ -32,8 +32,8 @@ #include #include -#include "maxscale/modules.h" -#include "maxscale/config.h" +#include "internal/modules.h" +#include "internal/config.h" typedef struct loaded_module { diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc index ea219b31e..48392306a 100644 --- a/server/core/log_manager.cc +++ b/server/core/log_manager.cc @@ -36,7 +36,7 @@ #include #include #include -#include "maxscale/mlist.h" +#include "internal/mlist.h" #define MAX_PREFIXLEN 250 #define MAX_SUFFIXLEN 250 diff --git a/server/core/maxkeys.c b/server/core/maxkeys.c index 7a8c92fae..ae6864cb7 100644 --- a/server/core/maxkeys.c +++ b/server/core/maxkeys.c @@ -22,7 +22,7 @@ * * @endverbatim */ -#include "maxscale/secrets.h" +#include "internal/secrets.h" #include #include diff --git a/server/core/maxpasswd.c b/server/core/maxpasswd.c index 07241be63..3788e7866 100644 --- a/server/core/maxpasswd.c +++ b/server/core/maxpasswd.c @@ -34,7 +34,7 @@ #include #include -#include "maxscale/secrets.h" +#include "internal/secrets.h" #ifdef HAVE_GLIBC struct option options[] = diff --git a/server/core/messagequeue.cc b/server/core/messagequeue.cc index 7ac0d5b28..a741edcf3 100644 --- a/server/core/messagequeue.cc +++ b/server/core/messagequeue.cc @@ -11,7 +11,7 @@ * Public License. */ -#include "maxscale/messagequeue.hh" +#include "internal/messagequeue.hh" #include #include #include @@ -19,7 +19,7 @@ #include #include #include -#include "maxscale/worker.hh" +#include "internal/worker.hh" namespace { diff --git a/server/core/misc.cc b/server/core/misc.cc index 43b931eb6..c70b8ac23 100644 --- a/server/core/misc.cc +++ b/server/core/misc.cc @@ -14,7 +14,7 @@ #include #include -#include "maxscale/maxscale.h" +#include "internal/maxscale.h" static time_t started; diff --git a/server/core/mlist.cc b/server/core/mlist.cc index 1c5557379..96c20f979 100644 --- a/server/core/mlist.cc +++ b/server/core/mlist.cc @@ -11,7 +11,7 @@ * Public License. */ -#include "maxscale/mlist.h" +#include "internal/mlist.h" #include static void mlist_free_memory(mlist_t* ml, char* name); diff --git a/server/core/modulecmd.cc b/server/core/modulecmd.cc index e2c3fab14..2688e612f 100644 --- a/server/core/modulecmd.cc +++ b/server/core/modulecmd.cc @@ -21,8 +21,8 @@ #include #include -#include "maxscale/filter.h" -#include "maxscale/monitor.h" +#include "internal/filter.h" +#include "internal/monitor.h" /** Size of the error buffer */ #define MODULECMD_ERRBUF_SIZE 512 diff --git a/server/core/monitor.cc b/server/core/monitor.cc index 13d6f90ba..7c9936e0f 100644 --- a/server/core/monitor.cc +++ b/server/core/monitor.cc @@ -37,13 +37,13 @@ #include #include #include +#include #include -#include "maxscale/config.h" -#include "maxscale/externcmd.h" -#include "maxscale/monitor.h" -#include "maxscale/modules.h" -#include "maxscale/json_api.h" +#include "internal/config.h" +#include "internal/externcmd.h" +#include "internal/monitor.h" +#include "internal/modules.h" /** Schema version, journals must have a matching version */ #define MMB_SCHEMA_VERSION 1 diff --git a/server/core/poll.cc b/server/core/poll.cc index dfe16e87c..ddefc7de3 100644 --- a/server/core/poll.cc +++ b/server/core/poll.cc @@ -35,8 +35,8 @@ #include #include #include -#include "maxscale/poll.h" -#include "maxscale/worker.hh" +#include "internal/poll.h" +#include "internal/worker.hh" using maxscale::Worker; diff --git a/server/core/query_classifier.cc b/server/core/query_classifier.cc index 7c4f54f81..2cf3dfa96 100644 --- a/server/core/query_classifier.cc +++ b/server/core/query_classifier.cc @@ -11,16 +11,16 @@ * Public License. */ -#include "maxscale/query_classifier.h" +#include "internal/query_classifier.h" #include #include #include #include #include #include -#include "maxscale/trxboundaryparser.hh" -#include "../core/maxscale/modules.h" +#include "internal/modules.h" +#include "internal/trxboundaryparser.hh" //#define QC_TRACE_ENABLED #undef QC_TRACE_ENABLED diff --git a/server/core/resource.cc b/server/core/resource.cc index fa1ccc36f..dbb92ac9b 100644 --- a/server/core/resource.cc +++ b/server/core/resource.cc @@ -10,7 +10,7 @@ * of this software will be governed by version 2 or later of the General * Public License. */ -#include "maxscale/resource.hh" +#include "internal/resource.hh" #include #include @@ -25,15 +25,15 @@ #include #include -#include "maxscale/httprequest.hh" -#include "maxscale/httpresponse.hh" -#include "maxscale/session.h" -#include "maxscale/filter.h" -#include "maxscale/monitor.h" -#include "maxscale/service.h" -#include "maxscale/config_runtime.h" -#include "maxscale/modules.h" -#include "maxscale/worker.h" +#include "internal/httprequest.hh" +#include "internal/httpresponse.hh" +#include "internal/session.h" +#include "internal/filter.h" +#include "internal/monitor.h" +#include "internal/service.h" +#include "internal/config_runtime.h" +#include "internal/modules.h" +#include "internal/worker.h" using std::list; using std::map; diff --git a/server/core/secrets.cc b/server/core/secrets.cc index 7d54debce..5328cc6c2 100644 --- a/server/core/secrets.cc +++ b/server/core/secrets.cc @@ -25,7 +25,7 @@ #include #include -#include "maxscale/secrets.h" +#include "internal/secrets.h" /** * Generate a random printable character diff --git a/server/core/server.cc b/server/core/server.cc index 51dd2cc2a..64823821a 100644 --- a/server/core/server.cc +++ b/server/core/server.cc @@ -41,10 +41,10 @@ #include #include -#include "maxscale/monitor.h" -#include "maxscale/poll.h" -#include "maxscale/workertask.hh" -#include "maxscale/worker.hh" +#include "internal/monitor.h" +#include "internal/poll.h" +#include "internal/workertask.hh" +#include "internal/worker.hh" using maxscale::Semaphore; using maxscale::Worker; diff --git a/server/core/service.cc b/server/core/service.cc index a043f1324..2482f6290 100644 --- a/server/core/service.cc +++ b/server/core/service.cc @@ -50,10 +50,10 @@ #include #include -#include "maxscale/config.h" -#include "maxscale/filter.h" -#include "maxscale/modules.h" -#include "maxscale/service.h" +#include "internal/config.h" +#include "internal/filter.h" +#include "internal/modules.h" +#include "internal/service.h" /** This define is needed in CentOS 6 systems */ #if !defined(UINT64_MAX) diff --git a/server/core/session.cc b/server/core/session.cc index d3679624e..1ebd6381c 100644 --- a/server/core/session.cc +++ b/server/core/session.cc @@ -37,11 +37,11 @@ #include #include -#include "maxscale/dcb.h" -#include "maxscale/session.h" -#include "maxscale/filter.h" -#include "maxscale/worker.hh" -#include "maxscale/workertask.hh" +#include "internal/dcb.h" +#include "internal/session.h" +#include "internal/filter.h" +#include "internal/worker.hh" +#include "internal/workertask.hh" using std::string; using std::stringstream; diff --git a/server/core/skygw_utils.cc b/server/core/skygw_utils.cc index 32694dee4..e05755246 100644 --- a/server/core/skygw_utils.cc +++ b/server/core/skygw_utils.cc @@ -27,7 +27,7 @@ #include #include #include -#include "maxscale/skygw_utils.h" +#include "internal/skygw_utils.h" #include #include #include diff --git a/server/core/statistics.cc b/server/core/statistics.cc index 67ba4d0e7..0c20439bd 100644 --- a/server/core/statistics.cc +++ b/server/core/statistics.cc @@ -23,7 +23,7 @@ * @endverbatim */ -#include "maxscale/statistics.h" +#include "internal/statistics.h" #include #include #include diff --git a/server/core/test/profile_trxboundaryparser.cc b/server/core/test/profile_trxboundaryparser.cc index 6d02d4b86..657a4a511 100644 --- a/server/core/test/profile_trxboundaryparser.cc +++ b/server/core/test/profile_trxboundaryparser.cc @@ -15,7 +15,7 @@ #include #include #include -#include "../maxscale/trxboundaryparser.hh" +#include "../internal/trxboundaryparser.hh" using namespace std; diff --git a/server/core/test/test_dcb.cc b/server/core/test/test_dcb.cc index ac7a79608..b555693d2 100644 --- a/server/core/test/test_dcb.cc +++ b/server/core/test/test_dcb.cc @@ -37,8 +37,8 @@ #include #include -#include "../maxscale/messagequeue.hh" -#include "../maxscale/worker.hh" +#include "../internal/messagequeue.hh" +#include "../internal/worker.hh" #include "../dcb.cc" /** diff --git a/server/core/test/test_filter.cc b/server/core/test/test_filter.cc index c7c7b267a..a3fe90baf 100644 --- a/server/core/test/test_filter.cc +++ b/server/core/test/test_filter.cc @@ -33,7 +33,7 @@ #include #include -#include "../maxscale/filter.h" +#include "../internal/filter.h" /** diff --git a/server/core/test/test_log.cc b/server/core/test/test_log.cc index 0af32ae53..41a1d4a43 100644 --- a/server/core/test/test_log.cc +++ b/server/core/test/test_log.cc @@ -19,7 +19,7 @@ #include #include #include -#include "../maxscale/skygw_utils.h" +#include "../internal/skygw_utils.h" #include static void skygw_log_enable(int priority) diff --git a/server/core/test/test_modulecmd.cc b/server/core/test/test_modulecmd.cc index c7959f046..dcfe72790 100644 --- a/server/core/test/test_modulecmd.cc +++ b/server/core/test/test_modulecmd.cc @@ -22,7 +22,7 @@ #include #include -#include "../maxscale/monitor.h" +#include "../internal/monitor.h" #define TEST(a, b) do{if (!(a)){printf("%s:%d " b "\n", __FILE__, __LINE__);return 1;}}while(false) diff --git a/server/core/test/test_service.cc b/server/core/test/test_service.cc index d14d3a4fa..a85ec975e 100644 --- a/server/core/test/test_service.cc +++ b/server/core/test/test_service.cc @@ -36,7 +36,7 @@ #include #include -#include "../maxscale/service.h" +#include "../internal/service.h" #include "test_utils.h" /** diff --git a/server/core/test/test_trxcompare.cc b/server/core/test/test_trxcompare.cc index cc74b2fe4..7efa1d83b 100644 --- a/server/core/test/test_trxcompare.cc +++ b/server/core/test/test_trxcompare.cc @@ -16,7 +16,7 @@ #include #include #include -#include "../maxscale/query_classifier.h" +#include "../internal/query_classifier.h" #include #include #include diff --git a/server/core/test/test_trxtracking.cc b/server/core/test/test_trxtracking.cc index 8ac7a1c29..275001f52 100644 --- a/server/core/test/test_trxtracking.cc +++ b/server/core/test/test_trxtracking.cc @@ -17,7 +17,7 @@ #include #include #include -#include "../core/maxscale/query_classifier.h" +#include "../core/internal/query_classifier.h" using namespace std; diff --git a/server/core/test/test_utils.h b/server/core/test/test_utils.h index f3e99eaea..ff7ae92cd 100644 --- a/server/core/test/test_utils.h +++ b/server/core/test/test_utils.h @@ -21,9 +21,9 @@ #include #include -#include "../maxscale/poll.h" -#include "../maxscale/statistics.h" -#include "../maxscale/worker.hh" +#include "../internal/poll.h" +#include "../internal/statistics.h" +#include "../internal/worker.hh" void init_test_env(char *path) diff --git a/server/core/worker.cc b/server/core/worker.cc index d01888a9d..aeae5fea5 100644 --- a/server/core/worker.cc +++ b/server/core/worker.cc @@ -11,7 +11,7 @@ * Public License. */ -#include "maxscale/worker.hh" +#include "internal/worker.hh" #include #include @@ -31,11 +31,11 @@ #include #include -#include "maxscale/dcb.h" -#include "maxscale/modules.h" -#include "maxscale/poll.h" -#include "maxscale/statistics.h" -#include "maxscale/workertask.hh" +#include "internal/dcb.h" +#include "internal/modules.h" +#include "internal/poll.h" +#include "internal/statistics.h" +#include "internal/workertask.hh" #define WORKER_ABSENT_ID -1 diff --git a/server/core/workertask.cc b/server/core/workertask.cc index ecd4be373..761bc37e6 100644 --- a/server/core/workertask.cc +++ b/server/core/workertask.cc @@ -11,7 +11,7 @@ * Public License. */ -#include "maxscale/workertask.hh" +#include "internal/workertask.hh" #include #include diff --git a/server/modules/filter/test/filtermodule.cc b/server/modules/filter/test/filtermodule.cc index aee8f40a9..14e8fe2de 100644 --- a/server/modules/filter/test/filtermodule.cc +++ b/server/modules/filter/test/filtermodule.cc @@ -12,8 +12,8 @@ */ #include -#include -#include "../../../core/maxscale/modules.h" +#include "maxscale/filtermodule.hh" +#include "../../../core/internal/modules.h" using std::auto_ptr; diff --git a/server/modules/filter/test/module.cc b/server/modules/filter/test/module.cc index cdd403076..ffce58e64 100644 --- a/server/modules/filter/test/module.cc +++ b/server/modules/filter/test/module.cc @@ -11,8 +11,8 @@ * Public License. */ -#include -#include "../../../core/maxscale/modules.h" +#include "maxscale/module.hh" +#include "../../../core/internal/modules.h" namespace maxscale { diff --git a/server/modules/monitor/mysqlmon/mysql_mon.cc b/server/modules/monitor/mysqlmon/mysql_mon.cc index c6e618773..b9abbb3f0 100644 --- a/server/modules/monitor/mysqlmon/mysql_mon.cc +++ b/server/modules/monitor/mysqlmon/mysql_mon.cc @@ -32,7 +32,7 @@ #include #include // TODO: For monitorAddParameters -#include "../../../core/maxscale/monitor.h" +#include "../../../core/internal/monitor.h" /** Column positions for SHOW SLAVE STATUS */ #define MYSQL55_STATUS_MASTER_LOG_POS 5 diff --git a/server/modules/protocol/MySQL/mariadb_client.cc b/server/modules/protocol/MySQL/mariadb_client.cc index 983e70abc..4860af332 100644 --- a/server/modules/protocol/MySQL/mariadb_client.cc +++ b/server/modules/protocol/MySQL/mariadb_client.cc @@ -15,7 +15,7 @@ #include // TODO: Find a way to cleanly expose this -#include "../../../core/maxscale/worker.hh" +#include "../../../core/internal/worker.hh" #ifdef EPOLLRDHUP #define ERROR_EVENTS (EPOLLRDHUP | EPOLLHUP | EPOLLERR) diff --git a/server/modules/routing/binlogrouter/test/testbinlog.c b/server/modules/routing/binlogrouter/test/testbinlog.c index 421b18a56..e02baf4b5 100644 --- a/server/modules/routing/binlogrouter/test/testbinlog.c +++ b/server/modules/routing/binlogrouter/test/testbinlog.c @@ -49,7 +49,7 @@ #include // This isn't really a clean way of testing -#include "../../../../core/maxscale/service.h" +#include "../../../../core/internal/service.h" static void printVersion(const char *progname); static void printUsage(const char *progname); diff --git a/server/modules/routing/debugcli/debugcmd.c b/server/modules/routing/debugcli/debugcmd.c index 7637ba9e0..3958825b2 100644 --- a/server/modules/routing/debugcli/debugcmd.c +++ b/server/modules/routing/debugcli/debugcmd.c @@ -56,12 +56,12 @@ #include -#include "../../../core/maxscale/config_runtime.h" -#include "../../../core/maxscale/maxscale.h" -#include "../../../core/maxscale/modules.h" -#include "../../../core/maxscale/monitor.h" -#include "../../../core/maxscale/poll.h" -#include "../../../core/maxscale/session.h" +#include "../../../core/internal/config_runtime.h" +#include "../../../core/internal/maxscale.h" +#include "../../../core/internal/modules.h" +#include "../../../core/internal/monitor.h" +#include "../../../core/internal/poll.h" +#include "../../../core/internal/session.h" #define MAXARGS 12 diff --git a/server/modules/routing/maxinfo/maxinfo.c b/server/modules/routing/maxinfo/maxinfo.c index 0957d61dc..04523d044 100644 --- a/server/modules/routing/maxinfo/maxinfo.c +++ b/server/modules/routing/maxinfo/maxinfo.c @@ -52,10 +52,10 @@ #include #include -#include "../../../core/maxscale/modules.h" -#include "../../../core/maxscale/monitor.h" -#include "../../../core/maxscale/session.h" -#include "../../../core/maxscale/poll.h" +#include "../../../core/internal/modules.h" +#include "../../../core/internal/monitor.h" +#include "../../../core/internal/session.h" +#include "../../../core/internal/poll.h" extern char *create_hex_sha1_sha1_passwd(char *passwd); diff --git a/server/modules/routing/maxinfo/maxinfo_exec.c b/server/modules/routing/maxinfo/maxinfo_exec.c index a0b1d5104..a1d49ce11 100644 --- a/server/modules/routing/maxinfo/maxinfo_exec.c +++ b/server/modules/routing/maxinfo/maxinfo_exec.c @@ -45,11 +45,11 @@ #include #include -#include "../../../core/maxscale/maxscale.h" -#include "../../../core/maxscale/modules.h" -#include "../../../core/maxscale/monitor.h" -#include "../../../core/maxscale/poll.h" -#include "../../../core/maxscale/session.h" +#include "../../../core/internal/maxscale.h" +#include "../../../core/internal/modules.h" +#include "../../../core/internal/monitor.h" +#include "../../../core/internal/poll.h" +#include "../../../core/internal/session.h" static void exec_show(DCB *dcb, MAXINFO_TREE *tree); static void exec_select(DCB *dcb, MAXINFO_TREE *tree);