Remove maxscale/alloc.h

The remaining contents were moved to maxbase/alloc.h.

examples/roundrobinrouter.cpp

@@ -39,7 +39,7 @@
 #include <string>
 #include <iterator>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>

include/maxscale/alloc.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2018 MariaDB Corporation Ab
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
- *
- * Change Date: 2022-01-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2 or later of the General
- * Public License.
- */
-#pragma once
-
-#include <maxscale/cdefs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <maxbase/alloc.h>
-
-MXS_BEGIN_DECLS
-
-/**
- * @brief Abort the process if the pointer is NULL.
- *
- * To be used in circumstances where a memory allocation failure
- * cannot - currently - be dealt with properly.
- */
-#define MXS_ABORT_IF_NULL(p) do {if (!p) {abort();}} while (false)
-
-/**
- * @brief Abort the process if the provided value is non-zero.
- *
- * To be used in circumstances where a memory allocation or other
- * fatal error cannot - currently - be dealt with properly.
- */
-#define MXS_ABORT_IF_TRUE(b) do {if (b) {abort();}} while (false)
-
-/**
- * @brief Abort the process if the provided value is zero.
- *
- * To be used in circumstances where a memory allocation or other
- * fatal error cannot - currently - be dealt with properly.
- */
-#define MXS_ABORT_IF_FALSE(b) do {if (!(b)) {abort();}} while (false)
-
-MXS_END_DECLS

include/maxscale/jansson.hh

@@ -20,7 +20,7 @@
 
 #include <maxbase/assert.h>
 #include <maxbase/jansson.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 namespace std
 {

maxutils/maxbase/include/maxbase/alloc.h

@@ -46,4 +46,28 @@ char* mxb_strndup_a(const char* s, size_t n    /*, const char *caller*/);
 #define MXS_STRDUP_A(s)     mxb_strdup_a(s    /*, __func__*/)
 #define MXS_STRNDUP_A(s, n) mxb_strndup_a(s, n    /*, __func__*/)
 
+/**
+ * @brief Abort the process if the pointer is NULL.
+ *
+ * To be used in circumstances where a memory allocation failure
+ * cannot - currently - be dealt with properly.
+ */
+#define MXS_ABORT_IF_NULL(p) do {if (!p) {abort();}} while (false)
+
+/**
+ * @brief Abort the process if the provided value is non-zero.
+ *
+ * To be used in circumstances where a memory allocation or other
+ * fatal error cannot - currently - be dealt with properly.
+ */
+#define MXS_ABORT_IF_TRUE(b) do {if (b) {abort();}} while (false)
+
+/**
+ * @brief Abort the process if the provided value is zero.
+ *
+ * To be used in circumstances where a memory allocation or other
+ * fatal error cannot - currently - be dealt with properly.
+ */
+#define MXS_ABORT_IF_FALSE(b) do {if (!(b)) {abort();}} while (false)
+
 MXB_END_DECLS

query_classifier/qc_sqlite/qc_sqlite.cc

@@ -28,7 +28,7 @@
 #include <vector>
 #include <mutex>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>

server/core/adminusers.cc

@@ -22,7 +22,7 @@
 #include <sys/stat.h>
 #include <string>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/adminusers.h>
 #include <maxbase/pam_utils.hh>

server/core/authenticator.cc

@@ -13,7 +13,7 @@
 
 #include <maxscale/authenticator.hh>
 #include <maxscale/modutil.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 #include "internal/modules.hh"
 /**

server/core/backend.cc

@@ -17,7 +17,7 @@
 
 #include <maxbase/atomic.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/protocol/mysql.hh>
 
 using namespace maxscale;

server/core/buffer.cc

@@ -18,7 +18,7 @@
 #include <sstream>
 
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/hint.h>
 #include <maxscale/utils.h>
 #include <maxscale/routingworker.hh>

server/core/config.cc

@@ -42,7 +42,7 @@
 #include <maxbase/atomic.hh>
 #include <maxbase/format.hh>
 #include <maxscale/adminusers.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/http.hh>

server/core/dcb.cc

@@ -40,7 +40,7 @@
 
 #include <atomic>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxbase/atomic.hh>
 #include <maxscale/clock.h>

server/core/encryption.cc

@@ -13,7 +13,7 @@
 
 #include <maxscale/ccdefs.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/encryption.h>
 
 EVP_CIPHER_CTX* mxs_evp_cipher_ctx_alloc()

server/core/externcmd.cc

@@ -21,7 +21,7 @@
 #include <thread>
 
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/pcre2.h>
 
 using std::string;

server/core/filter.cc

@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/session.hh>
 #include <maxscale/service.hh>

server/core/gateway.cc

@@ -47,7 +47,7 @@
 #include <maxbase/maxbase.hh>
 #include <maxbase/stacktrace.hh>
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>

server/core/hint.cc

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <maxbase/assert.h>
 #include <maxscale/hint.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * @file hint.c generic support routines for hints.

server/core/httpresponse.cc

@@ -16,7 +16,7 @@
 #include <string>
 #include <sstream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <sys/time.h>
 
 #include "internal/admin.hh"

server/core/listener.cc

@@ -33,7 +33,7 @@
 #include <maxscale/paths.h>
 #include <maxscale/ssl.hh>
 #include <maxscale/protocol.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/users.h>
 #include <maxscale/service.hh>
 #include <maxscale/poll.hh>

server/core/load_utils.cc

@@ -27,7 +27,7 @@
 #include <maxscale/modinfo.h>
 #include <maxscale/version.h>
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/json_api.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/protocol.hh>

server/core/maxpasswd.cc

@@ -24,7 +24,7 @@
 
 #include <maxscale/paths.h>
 #include <maxscale/random.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 #include "internal/secrets.hh"
 

server/core/maxscale_pcre2.cc

@@ -26,7 +26,7 @@
 
 #include <maxscale/pcre2.h>
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/log.hh>
 
 /**

server/core/modulecmd.cc

@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/pcre2.h>
 

server/core/modutil.cc

@@ -25,7 +25,7 @@
 #include <cctype>
 
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/poll.hh>

server/core/monitor.cc

@@ -30,7 +30,7 @@
 #include <vector>
 #include <mutex>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/json_api.hh>
 #include <maxscale/mariadb.hh>

server/core/mysql_utils.cc

@@ -30,7 +30,7 @@
 #include <maxbase/atomic.hh>
 #include <maxbase/format.hh>
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 
 MYSQL* mxs_mysql_real_connect(MYSQL* con, SERVER* server, const char* user, const char* passwd)

server/core/paths.cc

@@ -12,7 +12,7 @@
  */
 
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/utils.h>
 
 /**

server/core/poll.cc

@@ -28,7 +28,7 @@
 #include <mysql.h>
 #include <sys/epoll.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/clock.h>

server/core/query_classifier.cc

@@ -17,7 +17,7 @@
 #include <atomic>
 #include <random>
 #include <unordered_map>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxbase/format.hh>
 #include <maxscale/config.hh>

server/core/queryclassifier.cc

@@ -13,7 +13,7 @@
 
 #include <maxscale/queryclassifier.hh>
 #include <unordered_map>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>
 #include <maxscale/protocol/mysql.hh>

server/core/resource.cc

@@ -17,7 +17,7 @@
 #include <sstream>
 
 #include <maxscale/adminusers.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/http.hh>
 #include <maxscale/jansson.hh>

server/core/resultset.cc

@@ -16,7 +16,7 @@
 
 #include <numeric>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/resultset.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>

server/core/routingworker.cc

@@ -26,7 +26,7 @@
 
 #include <maxbase/atomic.hh>
 #include <maxbase/semaphore.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>

server/core/secrets.cc

@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/random.h>

server/core/server.cc

@@ -35,7 +35,7 @@
 #include <maxscale/dcb.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/ssl.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/utils.h>
 #include <maxscale/json_api.hh>

server/core/service.cc

@@ -37,7 +37,7 @@
 #include <maxbase/jansson.h>
 
 #include <maxscale/service.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/paths.h>
 #include <maxscale/listener.hh>

server/core/session.cc

@@ -28,7 +28,7 @@
 
 #include <maxbase/atomic.hh>
 #include <maxbase/host.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/housekeeper.h>

server/core/test/test_adminusers.cc

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <maxscale/paths.h>
 #include <maxscale/adminusers.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/utils.h>
 #include <maxscale/users.h>
 

server/core/test/test_buffer.cc

@@ -35,7 +35,7 @@
 
 #include <maxbase/assert.h>
 #include <maxbase/log.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/hint.h>
 

server/core/test/test_filter.cc

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 
 #include "../internal/filter.hh"

server/core/test/test_hint.cc

@@ -35,7 +35,7 @@
 
 #include <maxbase/assert.h>
 #include <maxscale/hint.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * test1    Allocate table of users and mess around with it

server/core/test/test_log.cc

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <time.h>
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/log.hh>
 
 static void skygw_log_enable(int priority)

server/core/test/test_logorder.cc

@@ -17,7 +17,7 @@
 #include <string.h>
 #include <time.h>
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/log.hh>
 
 static void skygw_log_enable(int priority)

server/core/test/test_maxscalepcre2.cc

@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/pcre2.h>
 
 #define test_assert(a, b) if (!(a)) {fprintf(stderr, b); return 1;}

server/core/test/test_modulecmd.cc

@@ -16,7 +16,7 @@
  */
 
 #include <maxbase/maxbase.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/paths.h>
 #include <maxscale/modulecmd.hh>

server/core/test/test_modutil.cc

@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include <maxbase/log.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/buffer.hh>
 

server/core/test/test_server.cc

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/server.hh>
 #include <maxscale/paths.h>
 #include <maxscale/config.hh>

server/core/test/test_service.cc

@@ -34,7 +34,7 @@
 #include <string.h>
 #include <maxscale/maxscale_test.h>
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 #include "../internal/service.hh"
 #include "test_utils.hh"

server/core/test/test_session_track.cc

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/protocol/mysql.hh>
 

server/core/test/test_trxcompare.cc

@@ -17,7 +17,7 @@
 #include <iostream>
 #include <string>
 #include "../internal/query_classifier.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>
 #include "../../../query_classifier/test/testreader.hh"

server/core/test/test_utils.hh

@@ -21,7 +21,7 @@
 #include <maxscale/config.hh>
 #include <maxscale/query_classifier.hh>
 #include <maxscale/paths.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/routingworker.hh>
 
 #include <sys/stat.h>

server/core/utils.cc

@@ -45,7 +45,7 @@
 #include <curl/curl.h>
 #include <crypt.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/limits.h>

server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc

@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <cdc.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/event.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/modutil.hh>

server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc

@@ -15,7 +15,7 @@
 
 #include <maxscale/ccdefs.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/mysql_utils.hh>

server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc

@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "GSSAPIBackendAuth"
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.hh>

server/modules/authenticator/GSSAPI/gssapi_auth_common.cc

@@ -12,7 +12,7 @@
  */
 
 #include "gssapi_auth.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * @brief Report GSSAPI errors

server/modules/authenticator/HTTPAuth/http_auth.cc

@@ -27,7 +27,7 @@
 #define MXS_MODULE_NAME "HTTPAuth"
 
 #include <maxscale/authenticator.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>

server/modules/authenticator/MariaDBAuth/dbusers.cc

@@ -21,7 +21,7 @@
 #include <netdb.h>
 #include <stdio.h>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/maxscale.h>
 #include <maxscale/mysql_utils.hh>

server/modules/authenticator/MariaDBAuth/mysql_auth.cc

@@ -29,7 +29,7 @@
 
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/authenticator.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/event.hh>
 #include <maxscale/poll.hh>
 #include <maxscale/paths.h>

server/modules/authenticator/MariaDBBackendAuth/mysql_backend_auth.cc

@@ -24,7 +24,7 @@
 
 #define MXS_MODULE_NAME "MariaDBBackendAuth"
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/server.hh>

server/modules/authenticator/MaxAdminAuth/max_admin_auth.cc

@@ -29,7 +29,7 @@
 #define MXS_MODULE_NAME "MaxAdminAuth"
 
 #include <maxscale/authenticator.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>

server/modules/authenticator/PAM/PAMAuth/pam_auth.hh

@@ -20,7 +20,7 @@
 #include <maxscale/ccdefs.hh>
 
 #include <string>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/protocol/mysql.hh>

server/modules/filter/binlogfilter/binlogfiltersession.cc

@@ -49,7 +49,7 @@
 #include <algorithm>
 
 #include <maxscale/protocol/mysql.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/poll.hh>
 #include <maxscale/modutil.hh>
 

server/modules/filter/cache/cache.cc

@@ -17,7 +17,7 @@
 #include <set>
 #include <string>
 #include <zlib.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>

server/modules/filter/cache/cachefilter.cc

@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "cache"
 #include "cachefilter.hh"
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/jansson.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/paths.h>

server/modules/filter/cache/cachefiltersession.cc

@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "cache"
 #include "cachefiltersession.hh"
 #include <new>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/query_classifier.hh>

server/modules/filter/cache/rules.cc

@@ -19,7 +19,7 @@
 #include <new>
 #include <vector>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>

server/modules/filter/cache/storage/storage_inmemory/inmemorystorage.cc

@@ -13,7 +13,7 @@
 
 #define MXS_MODULE_NAME "storage_inmemory"
 #include "inmemorystorage.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>
 #include "../../cache.hh"

server/modules/filter/cache/storagefactory.cc

@@ -16,7 +16,7 @@
 #include <dlfcn.h>
 #include <sys/param.h>
 #include <new>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include "cachefilter.hh"
 #include "lrustoragest.hh"

server/modules/filter/cache/test/testkeygeneration.cc

@@ -15,7 +15,7 @@
 #include <iostream>
 #include <fstream>
 #include <unordered_map>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.hh>
 #include "storagefactory.hh"

server/modules/filter/cache/test/testlrustorage.cc

@@ -13,7 +13,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <iostream>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include "teststorage.hh"
 #include "testerlrustorage.hh"

server/modules/filter/cache/test/testrawstorage.cc

@@ -13,7 +13,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <iostream>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include "teststorage.hh"
 #include "testerrawstorage.hh"

server/modules/filter/cache/test/testrules.cc

@@ -14,7 +14,7 @@
 #include "rules.hh"
 #include <algorithm>
 #include <iostream>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/paths.h>
 #include <maxscale/protocol/mysql.hh>

server/modules/filter/cache/test/teststorage.cc

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <iostream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.hh>
 #include <maxscale/utils.h>

server/modules/filter/ccrfilter/ccrfilter.cc

@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/hint.h>
 #include <maxscale/modinfo.h>

server/modules/filter/dbfwfilter/dbfwfilter.cc

@@ -74,7 +74,7 @@
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <maxscale/pcre2.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/utils.h>
 
 #include "rules.hh"

server/modules/filter/dbfwfilter/rules.cc

@@ -15,7 +15,7 @@
 
 #include <algorithm>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>

server/modules/filter/dbfwfilter/user.cc

@@ -13,7 +13,7 @@
 
 #include "user.hh"
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/protocol/mysql.hh>
 

server/modules/filter/hintfilter/hintfilter.cc

@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <maxscale/filter.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>
 #include "mysqlhint.hh"

server/modules/filter/insertstream/insertstream.cc

@@ -16,7 +16,7 @@
 #include <maxscale/ccdefs.hh>
 
 #include <strings.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>

server/modules/filter/luafilter/luafilter.cc

@@ -50,7 +50,7 @@ extern "C"
 }
 
 #include <mutex>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modutil.hh>
 #include <maxscale/query_classifier.hh>

server/modules/filter/maxrows/maxrows.cc

@@ -21,7 +21,7 @@
 #include <stdint.h>
 
 #include <maxbase/assert.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/buffer.hh>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>

server/modules/filter/mqfilter/mqfilter.cc

@@ -77,7 +77,7 @@
 #include <maxscale/query_classifier.hh>
 #include <maxscale/session.hh>
 #include <maxscale/mainworker.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 static int uid_gen;
 static int hktask_id = 0;

server/modules/filter/namedserverfilter/namedserverfilter.cc

@@ -37,7 +37,7 @@
 #include <string.h>
 #include <vector>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/hint.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>

server/modules/filter/qlafilter/qlafilter.cc

@@ -37,7 +37,7 @@
 #include <sstream>
 #include <string>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxbase/format.hh>
 #include <maxscale/modinfo.h>

server/modules/filter/regexfilter/regexfilter.cc

@@ -16,7 +16,7 @@
 #include <maxscale/ccdefs.hh>
 #include <string.h>
 #include <stdio.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/filter.hh>

server/modules/filter/tee/tee.cc

@@ -19,7 +19,7 @@
 
 #include <maxscale/ccdefs.hh>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/pcre2.hh>

server/modules/filter/test/module.cc

@@ -12,7 +12,7 @@
  */
 
 #include "maxscale/module.hh"
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <string>
 #include "../../../core/internal/modules.hh"
 

server/modules/filter/topfilter/topfilter.cc

@@ -45,7 +45,7 @@
 #include <sys/time.h>
 #include <regex.h>
 #include <maxbase/atomic.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /*
  * The filter entry points

server/modules/filter/tpmfilter/tpmfilter.cc

@@ -55,7 +55,7 @@
 #include <regex.h>
 #include <thread>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/filter.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>

server/modules/monitor/auroramon/auroramon.cc

@@ -19,7 +19,7 @@
 
 #include "auroramon.hh"
 #include <mysqld_error.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxbase/assert.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/mysql_utils.hh>

server/modules/monitor/galeramon/galeramon.cc

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <mysql.h>
 #include <mysqld_error.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.hh>
 #include <maxscale/modinfo.h>

server/modules/monitor/mariadbmon/mariadbmon.cc

@@ -21,7 +21,7 @@
 #include <sstream>
 #include <maxbase/assert.h>
 #include <maxbase/format.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/modulecmd.hh>
 #include <maxscale/mysql_utils.hh>

server/modules/monitor/mariadbmon/test/test_cycle_find.cc

@@ -20,7 +20,7 @@
 #include <vector>
 #include <maxbase/log.hh>
 #include <maxbase/maxbase.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include "../../../../core/internal/server.hh"
 
 using std::string;

server/modules/protocol/CDC/cdc.cc

@@ -34,7 +34,7 @@
 
 #include <maxscale/ccdefs.hh>
 #include <cdc.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/protocol.hh>
 #include <maxscale/modinfo.h>

server/modules/protocol/HTTPD/httpd.cc

@@ -36,7 +36,7 @@
 
 #include "httpd.hh"
 #include <ctype.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/protocol.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/resultset.hh>

server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc

@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "mariadbbackend"
 
 #include <maxscale/ccdefs.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/limits.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>

server/modules/protocol/MySQL/mariadbclient/mysql_client.cc

@@ -25,7 +25,7 @@
 #include <vector>
 #include <sstream>
 
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/authenticator.hh>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.hh>

server/modules/protocol/MySQL/mysql_common.cc

@@ -22,7 +22,7 @@
 #include <map>
 
 #include <maxsql/mariadb.hh>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/clock.h>
 #include <maxscale/modutil.hh>
 #include <maxscale/mysql_utils.hh>

server/modules/protocol/maxscaled/maxscaled.cc

@@ -38,7 +38,7 @@
 #include <maxscale/modinfo.h>
 #include "maxscaled.hh"
 #include <maxscale/maxadmin.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 
 /**
  * @file maxscaled.c - MaxScale administration protocol

server/modules/protocol/telnetd/telnetd.cc

@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <maxscale/alloc.h>
+#include <maxbase/alloc.h>
 #include <maxscale/dcb.hh>
 #include <maxscale/buffer.hh>
 #include <maxscale/service.hh>