From f3f802cabed8fee4395b204ad6a94141fe3050ad Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 14 Aug 2018 10:58:09 +0300 Subject: [PATCH] MXS-2008 Move maxscale/atomic.h to maxbase/atomic.h --- examples/testfilter.c | 2 +- include/maxscale/session.h | 2 +- .../maxbase/include/maxbase}/atomic.h | 14 +++++++------- maxutils/maxbase/src/CMakeLists.txt | 8 +++++++- {server/core => maxutils/maxbase/src}/atomic.cc | 6 +++--- server/core/CMakeLists.txt | 1 - server/core/admin.cc | 2 +- server/core/buffer.cc | 2 +- server/core/config_runtime.cc | 2 +- server/core/dcb.cc | 4 ++-- server/core/event.cc | 2 +- server/core/hashtable.cc | 2 +- server/core/housekeeper.cc | 2 +- server/core/log_manager.cc | 2 ++ server/core/poll.cc | 2 +- server/core/query_classifier.cc | 2 +- server/core/routingworker.cc | 2 +- server/core/session.cc | 2 +- server/core/spinlock.cc | 2 +- server/core/test/test_atomic.cc | 2 +- server/core/test/test_hash.cc | 2 +- server/core/worker.cc | 2 +- server/core/workertask.cc | 2 +- server/modules/filter/cache/cachept.cc | 2 +- server/modules/filter/dbfwfilter/dbfwfilter.cc | 2 +- server/modules/filter/mqfilter/mqfilter.cc | 2 +- server/modules/filter/qlafilter/qlafilter.cc | 2 +- server/modules/filter/regexfilter/regexfilter.cc | 2 +- server/modules/filter/topfilter/topfilter.cc | 2 +- server/modules/filter/tpmfilter/tpmfilter.cc | 2 +- server/modules/include/cdc.h | 2 +- server/modules/protocol/HTTPD/httpd.h | 2 +- server/modules/protocol/maxscaled/maxscaled.cc | 2 +- server/modules/protocol/telnetd/telnetd.cc | 2 +- server/modules/routing/avrorouter/avro.cc | 2 +- server/modules/routing/avrorouter/avro_client.cc | 2 +- server/modules/routing/avrorouter/avro_main.cc | 2 +- server/modules/routing/binlogrouter/blr.cc | 2 +- server/modules/routing/binlogrouter/blr_cache.cc | 2 +- server/modules/routing/binlogrouter/blr_file.cc | 2 +- server/modules/routing/binlogrouter/blr_master.cc | 2 +- server/modules/routing/binlogrouter/blr_slave.cc | 2 +- .../routing/binlogrouter/test/testbinlog.cc | 2 +- server/modules/routing/cli/cli.cc | 2 +- server/modules/routing/debugcli/debugcli.cc | 2 +- server/modules/routing/debugcli/debugcmd.cc | 2 +- server/modules/routing/hintrouter/dcb.cc | 2 +- server/modules/routing/maxinfo/maxinfo.cc | 2 +- server/modules/routing/maxinfo/maxinfo_error.cc | 2 +- server/modules/routing/maxinfo/maxinfo_exec.cc | 2 +- server/modules/routing/maxinfo/maxinfo_parse.cc | 2 +- .../modules/routing/readconnroute/readconnroute.cc | 2 +- 52 files changed, 67 insertions(+), 60 deletions(-) rename {include/maxscale => maxutils/maxbase/include/maxbase}/atomic.h (95%) rename {server/core => maxutils/maxbase/src}/atomic.cc (96%) diff --git a/examples/testfilter.c b/examples/testfilter.c index 1a0978e10..020e11bb0 100644 --- a/examples/testfilter.c +++ b/examples/testfilter.c @@ -11,11 +11,11 @@ * Public License. */ #include +#include #include #include #include #include -#include /** * @file testfilter.c - a very simple test filter. diff --git a/include/maxscale/session.h b/include/maxscale/session.h index f416ae5c2..6d3b9cb1b 100644 --- a/include/maxscale/session.h +++ b/include/maxscale/session.h @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include diff --git a/include/maxscale/atomic.h b/maxutils/maxbase/include/maxbase/atomic.h similarity index 95% rename from include/maxscale/atomic.h rename to maxutils/maxbase/include/maxbase/atomic.h index d6b3dc58d..79847a30a 100644 --- a/include/maxscale/atomic.h +++ b/maxutils/maxbase/include/maxbase/atomic.h @@ -13,12 +13,12 @@ */ /** - * @file atomic.h The atomic operations used within the gateway + * @file atomic.h Atomic operations on integers. */ -#include +#include -MXS_BEGIN_DECLS +MXB_BEGIN_DECLS /** * Pre 4.7 GCC doesn't support the __atomic builtin functions. The older __sync @@ -26,8 +26,8 @@ MXS_BEGIN_DECLS * hack to emulate the store/load. */ #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) -#ifndef MXS_USE_ATOMIC_BUILTINS -#define MXS_USE_ATOMIC_BUILTINS 1 +#ifndef MXB_USE_ATOMIC_BUILTINS +#define MXB_USE_ATOMIC_BUILTINS 1 #endif #endif @@ -95,7 +95,7 @@ static inline void atomic_synchronize() { #ifdef __GNUC__ -#ifdef MXS_USE_ATOMIC_BUILTINS +#ifdef MXB_USE_ATOMIC_BUILTINS __atomic_thread_fence(__ATOMIC_SEQ_CST); #else __sync_synchronize(); /* Memory barrier. */ @@ -130,4 +130,4 @@ bool atomic_cas_ptr(void **variable, void** old_value, void *new_value); */ int atomic_exchange_int(int *variable, int new_value); -MXS_END_DECLS +MXB_END_DECLS diff --git a/maxutils/maxbase/src/CMakeLists.txt b/maxutils/maxbase/src/CMakeLists.txt index 59cac15a1..f85b7c2ce 100644 --- a/maxutils/maxbase/src/CMakeLists.txt +++ b/maxutils/maxbase/src/CMakeLists.txt @@ -1,3 +1,9 @@ -add_library(maxbase STATIC eventcount.cc stopwatch.cc stacktrace.cc logger.cc) +add_library(maxbase STATIC + atomic.cc + eventcount.cc + logger.cc + stopwatch.cc + stacktrace.cc + ) set_target_properties(maxbase PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs) install(TARGETS maxbase DESTINATION lib) diff --git a/server/core/atomic.cc b/maxutils/maxbase/src/atomic.cc similarity index 96% rename from server/core/atomic.cc rename to maxutils/maxbase/src/atomic.cc index 568ac696c..eb1b176f7 100644 --- a/server/core/atomic.cc +++ b/maxutils/maxbase/src/atomic.cc @@ -11,10 +11,10 @@ * Public License. */ -#include +#include /** - * @file atomic.c - Implementation of atomic operations for MaxScale + * @file atomic.c - Implementation of atomic operations */ int atomic_add(int *variable, int value) @@ -106,4 +106,4 @@ bool atomic_cas_ptr(void **variable, void** old_value, void *new_value) int atomic_exchange_int(int *variable, int new_value) { return __atomic_exchange_n(variable, new_value, __ATOMIC_SEQ_CST); -} \ No newline at end of file +} diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt index 07a3f7b91..54793f3a0 100644 --- a/server/core/CMakeLists.txt +++ b/server/core/CMakeLists.txt @@ -2,7 +2,6 @@ add_library(maxscale-common SHARED admin.cc adminusers.cc alloc.cc - atomic.cc authenticator.cc backend.cc buffer.cc diff --git a/server/core/admin.cc b/server/core/admin.cc index 8f5237bea..2a38bc1a6 100644 --- a/server/core/admin.cc +++ b/server/core/admin.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/buffer.cc b/server/core/buffer.cc index 7d6a3e095..1552d6ed6 100644 --- a/server/core/buffer.cc +++ b/server/core/buffer.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc index 45c539419..a2d5c674b 100644 --- a/server/core/config_runtime.cc +++ b/server/core/config_runtime.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/dcb.cc b/server/core/dcb.cc index 43399a4ba..a494a3c66 100644 --- a/server/core/dcb.cc +++ b/server/core/dcb.cc @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/server/core/event.cc b/server/core/event.cc index cc503eb2b..21449f3b3 100644 --- a/server/core/event.cc +++ b/server/core/event.cc @@ -14,7 +14,7 @@ #include "internal/event.hh" #include #include -#include +#include #include using namespace std; diff --git a/server/core/hashtable.cc b/server/core/hashtable.cc index f5a940a33..ac947d03f 100644 --- a/server/core/hashtable.cc +++ b/server/core/hashtable.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include /** diff --git a/server/core/housekeeper.cc b/server/core/housekeeper.cc index 351ad95c8..e4b1dd7fe 100644 --- a/server/core/housekeeper.cc +++ b/server/core/housekeeper.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc index 0bd751d8f..ed4bcc7bd 100644 --- a/server/core/log_manager.cc +++ b/server/core/log_manager.cc @@ -21,9 +21,11 @@ #include #include +#include #include #include +#include #include #include #include diff --git a/server/core/poll.cc b/server/core/poll.cc index 1e9982f1c..c75e0db09 100644 --- a/server/core/poll.cc +++ b/server/core/poll.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/query_classifier.cc b/server/core/query_classifier.cc index 7804c91d1..d7bac5384 100644 --- a/server/core/query_classifier.cc +++ b/server/core/query_classifier.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/core/routingworker.cc b/server/core/routingworker.cc index ae443c9cb..01c629d42 100644 --- a/server/core/routingworker.cc +++ b/server/core/routingworker.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/session.cc b/server/core/session.cc index 80d2b312f..a631117d9 100644 --- a/server/core/session.cc +++ b/server/core/session.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/spinlock.cc b/server/core/spinlock.cc index 390e911a1..5461ea123 100644 --- a/server/core/spinlock.cc +++ b/server/core/spinlock.cc @@ -12,7 +12,7 @@ */ #include -#include +#include #include #include diff --git a/server/core/test/test_atomic.cc b/server/core/test/test_atomic.cc index 0ba477798..dad121cbe 100644 --- a/server/core/test/test_atomic.cc +++ b/server/core/test/test_atomic.cc @@ -16,7 +16,7 @@ #include #include -#include +#include #include diff --git a/server/core/test/test_hash.cc b/server/core/test/test_hash.cc index 90de5d6e3..28902516e 100644 --- a/server/core/test/test_hash.cc +++ b/server/core/test/test_hash.cc @@ -36,7 +36,7 @@ #include #include -#include +#include #include static void diff --git a/server/core/worker.cc b/server/core/worker.cc index 925c6a012..502a68898 100644 --- a/server/core/worker.cc +++ b/server/core/worker.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/core/workertask.cc b/server/core/workertask.cc index 1dcc91a3f..65df51f1e 100644 --- a/server/core/workertask.cc +++ b/server/core/workertask.cc @@ -12,7 +12,7 @@ */ #include -#include +#include #include namespace maxscale diff --git a/server/modules/filter/cache/cachept.cc b/server/modules/filter/cache/cachept.cc index 2d25eadf9..60c9ffa33 100644 --- a/server/modules/filter/cache/cachept.cc +++ b/server/modules/filter/cache/cachept.cc @@ -14,7 +14,7 @@ #define MXS_MODULE_NAME "cache" #include "cachept.hh" -#include +#include #include #include diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc index 17d977d9a..e0a585606 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.cc +++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc @@ -69,7 +69,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/mqfilter/mqfilter.cc b/server/modules/filter/mqfilter/mqfilter.cc index 376ff58e1..8eded457b 100644 --- a/server/modules/filter/mqfilter/mqfilter.cc +++ b/server/modules/filter/mqfilter/mqfilter.cc @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc index fe928c2ff..e91e96d7b 100644 --- a/server/modules/filter/qlafilter/qlafilter.cc +++ b/server/modules/filter/qlafilter/qlafilter.cc @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/regexfilter/regexfilter.cc b/server/modules/filter/regexfilter/regexfilter.cc index 25bc26a1d..c336991d4 100644 --- a/server/modules/filter/regexfilter/regexfilter.cc +++ b/server/modules/filter/regexfilter/regexfilter.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/filter/topfilter/topfilter.cc b/server/modules/filter/topfilter/topfilter.cc index e4c988345..246be4964 100644 --- a/server/modules/filter/topfilter/topfilter.cc +++ b/server/modules/filter/topfilter/topfilter.cc @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include /* diff --git a/server/modules/filter/tpmfilter/tpmfilter.cc b/server/modules/filter/tpmfilter/tpmfilter.cc index 9f519a5c2..e5980d269 100644 --- a/server/modules/filter/tpmfilter/tpmfilter.cc +++ b/server/modules/filter/tpmfilter/tpmfilter.cc @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include /* The maximum size for query statements in a transaction (64MB) */ diff --git a/server/modules/include/cdc.h b/server/modules/include/cdc.h index 1a2a072a7..336f3e8d3 100644 --- a/server/modules/include/cdc.h +++ b/server/modules/include/cdc.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include MXS_BEGIN_DECLS diff --git a/server/modules/protocol/HTTPD/httpd.h b/server/modules/protocol/HTTPD/httpd.h index 0b14c1079..85d40830c 100644 --- a/server/modules/protocol/HTTPD/httpd.h +++ b/server/modules/protocol/HTTPD/httpd.h @@ -36,7 +36,7 @@ #include #include #include -#include +#include MXS_BEGIN_DECLS diff --git a/server/modules/protocol/maxscaled/maxscaled.cc b/server/modules/protocol/maxscaled/maxscaled.cc index c80121cdb..a95e1fccb 100644 --- a/server/modules/protocol/maxscaled/maxscaled.cc +++ b/server/modules/protocol/maxscaled/maxscaled.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/protocol/telnetd/telnetd.cc b/server/modules/protocol/telnetd/telnetd.cc index 2c8ebcda0..a067f0218 100644 --- a/server/modules/protocol/telnetd/telnetd.cc +++ b/server/modules/protocol/telnetd/telnetd.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc index e0e719fb1..e042eac88 100644 --- a/server/modules/routing/avrorouter/avro.cc +++ b/server/modules/routing/avrorouter/avro.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/avrorouter/avro_client.cc b/server/modules/routing/avrorouter/avro_client.cc index b09905c97..766eef946 100644 --- a/server/modules/routing/avrorouter/avro_client.cc +++ b/server/modules/routing/avrorouter/avro_client.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/avrorouter/avro_main.cc b/server/modules/routing/avrorouter/avro_main.cc index 7a82ce350..9cb1ff27e 100644 --- a/server/modules/routing/avrorouter/avro_main.cc +++ b/server/modules/routing/avrorouter/avro_main.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/blr.cc b/server/modules/routing/binlogrouter/blr.cc index 8a9b5fd12..0c6a943df 100644 --- a/server/modules/routing/binlogrouter/blr.cc +++ b/server/modules/routing/binlogrouter/blr.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/blr_cache.cc b/server/modules/routing/binlogrouter/blr_cache.cc index f122bc81e..cebe70aff 100644 --- a/server/modules/routing/binlogrouter/blr_cache.cc +++ b/server/modules/routing/binlogrouter/blr_cache.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/blr_file.cc b/server/modules/routing/binlogrouter/blr_file.cc index acc1cf3a0..44a76312e 100644 --- a/server/modules/routing/binlogrouter/blr_file.cc +++ b/server/modules/routing/binlogrouter/blr_file.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/blr_master.cc b/server/modules/routing/binlogrouter/blr_master.cc index 4347c569e..80f076f57 100644 --- a/server/modules/routing/binlogrouter/blr_master.cc +++ b/server/modules/routing/binlogrouter/blr_master.cc @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/blr_slave.cc b/server/modules/routing/binlogrouter/blr_slave.cc index 2b5cf278b..e456c47c9 100644 --- a/server/modules/routing/binlogrouter/blr_slave.cc +++ b/server/modules/routing/binlogrouter/blr_slave.cc @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/binlogrouter/test/testbinlog.cc b/server/modules/routing/binlogrouter/test/testbinlog.cc index c008a2bf3..27ea8213d 100644 --- a/server/modules/routing/binlogrouter/test/testbinlog.cc +++ b/server/modules/routing/binlogrouter/test/testbinlog.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/cli/cli.cc b/server/modules/routing/cli/cli.cc index 4a7de00ea..ce74d67eb 100644 --- a/server/modules/routing/cli/cli.cc +++ b/server/modules/routing/cli/cli.cc @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/debugcli/debugcli.cc b/server/modules/routing/debugcli/debugcli.cc index 78fbe0f16..037c07ee6 100644 --- a/server/modules/routing/debugcli/debugcli.cc +++ b/server/modules/routing/debugcli/debugcli.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/debugcli/debugcmd.cc b/server/modules/routing/debugcli/debugcmd.cc index 50fa1cc4e..8aa4994fe 100644 --- a/server/modules/routing/debugcli/debugcmd.cc +++ b/server/modules/routing/debugcli/debugcmd.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/hintrouter/dcb.cc b/server/modules/routing/hintrouter/dcb.cc index 846b35bd7..ec76de24d 100644 --- a/server/modules/routing/hintrouter/dcb.cc +++ b/server/modules/routing/hintrouter/dcb.cc @@ -12,7 +12,7 @@ */ #include "dcb.hh" -#include +#include #include Dcb::Dcb(DCB* pDcb) diff --git a/server/modules/routing/maxinfo/maxinfo.cc b/server/modules/routing/maxinfo/maxinfo.cc index 43fa9d56b..88a636699 100644 --- a/server/modules/routing/maxinfo/maxinfo.cc +++ b/server/modules/routing/maxinfo/maxinfo.cc @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/maxinfo/maxinfo_error.cc b/server/modules/routing/maxinfo/maxinfo_error.cc index e92f6b169..f8713c464 100644 --- a/server/modules/routing/maxinfo/maxinfo_error.cc +++ b/server/modules/routing/maxinfo/maxinfo_error.cc @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/maxinfo/maxinfo_exec.cc b/server/modules/routing/maxinfo/maxinfo_exec.cc index 24d615b3f..930b440e9 100644 --- a/server/modules/routing/maxinfo/maxinfo_exec.cc +++ b/server/modules/routing/maxinfo/maxinfo_exec.cc @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/maxinfo/maxinfo_parse.cc b/server/modules/routing/maxinfo/maxinfo_parse.cc index b8c6f63b7..3b3a51a18 100644 --- a/server/modules/routing/maxinfo/maxinfo_parse.cc +++ b/server/modules/routing/maxinfo/maxinfo_parse.cc @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/server/modules/routing/readconnroute/readconnroute.cc b/server/modules/routing/readconnroute/readconnroute.cc index baecbdaf1..b570e8a40 100644 --- a/server/modules/routing/readconnroute/readconnroute.cc +++ b/server/modules/routing/readconnroute/readconnroute.cc @@ -81,7 +81,7 @@ #include #include #include -#include +#include #include #include #include