MXS-2008 Move maxscale/atomic.h to maxbase/atomic.h

2018-08-14 10:58:09 +03:00 · 2018-08-14 10:58:09 +03:00 · f3f802cabe
commit f3f802cabe
parent d53bc9d3be
52 changed files with 67 additions and 60 deletions
--- a/examples/testfilter.c
+++ b/examples/testfilter.c
@ -11,11 +11,11 @@
 * Public License.
 */
 #include <stdio.h>
+#include <maxbase/atomic.h>
 #include <maxscale/filter.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/atomic.h>

 /**
 * @file testfilter.c - a very simple test filter.
--- a/include/maxscale/session.h
+++ b/include/maxscale/session.h
@ -20,7 +20,7 @@

 #include <time.h>

-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
 #include <maxscale/log_manager.h>
--- a/maxutils/maxbase/include/maxbase/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 <maxscale/cdefs.h>
+#include <maxbase/cdefs.h>

-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
--- 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)
--- a/maxutils/maxbase/src/atomic.cc
+++ b/maxutils/maxbase/src/atomic.cc
@ -11,10 +11,10 @@
 * Public License.
 */

-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>

 /**
- * @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);
-}
+}
--- 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
--- a/server/core/admin.cc
+++ b/server/core/admin.cc
@ -26,7 +26,7 @@
 #include <netdb.h>
 #include <sys/stat.h>

-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/debug.h>
 #include <maxscale/utils.h>
 #include <maxscale/config.h>
--- a/server/core/buffer.cc
+++ b/server/core/buffer.cc
@ -18,7 +18,7 @@
 #include <sstream>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/debug.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/hint.h>
--- a/server/core/config_runtime.cc
+++ b/server/core/config_runtime.cc
@ -26,7 +26,7 @@
 #include <tuple>
 #include <vector>

-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/clock.h>
 #include <maxscale/jansson.hh>
 #include <maxscale/json_api.h>
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@ -39,8 +39,8 @@
 #include <time.h>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>
 #include <maxscale/listener.h>
--- a/server/core/event.cc
+++ b/server/core/event.cc
@ -14,7 +14,7 @@
 #include "internal/event.hh"
 #include <algorithm>
 #include <string.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/debug.h>

 using namespace std;
--- a/server/core/hashtable.cc
+++ b/server/core/hashtable.cc
@ -19,7 +19,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/hashtable.h>

 /**
--- a/server/core/housekeeper.cc
+++ b/server/core/housekeeper.cc
@ -20,7 +20,7 @@

 #include <maxbase/semaphore.h>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/clock.h>
 #include <maxscale/config.h>
 #include <maxscale/housekeeper.h>
--- a/server/core/log_manager.cc
+++ b/server/core/log_manager.cc
@ -21,9 +21,11 @@
 #include <string>
 #include <mutex>

+#include <maxbase/atomic.h>
 #include <maxbase/error.h>
 #include <maxbase/logger.hh>

+#include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/debug.h>
 #include <maxscale/json_api.h>
--- a/server/core/poll.cc
+++ b/server/core/poll.cc
@ -29,7 +29,7 @@
 #include <sys/epoll.h>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/clock.h>
 #include <maxscale/platform.h>
--- a/server/core/query_classifier.cc
+++ b/server/core/query_classifier.cc
@ -18,7 +18,7 @@
 #include <random>
 #include <unordered_map>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/json_api.h>
 #include <maxscale/log_manager.h>
--- a/server/core/routingworker.cc
+++ b/server/core/routingworker.cc
@ -22,7 +22,7 @@
 #include <sstream>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/clock.h>
 #include <maxscale/limits.h>
--- a/server/core/session.cc
+++ b/server/core/session.cc
@ -27,7 +27,7 @@
 #include <sstream>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/clock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
--- a/server/core/spinlock.cc
+++ b/server/core/spinlock.cc
@ -12,7 +12,7 @@
 */

 #include <maxscale/spinlock.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <time.h>
 #include <maxscale/debug.h>

--- a/server/core/test/test_atomic.cc
+++ b/server/core/test/test_atomic.cc
@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <thread>

-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/debug.h>


--- a/server/core/test/test_hash.cc
+++ b/server/core/test/test_hash.cc
@ -36,7 +36,7 @@
 #include <time.h>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/hashtable.h>

 static void
--- a/server/core/worker.cc
+++ b/server/core/worker.cc
@ -22,7 +22,7 @@
 #include <sstream>
 #include <sys/timerfd.h>

-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/clock.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/semaphore.hh>
--- a/server/core/workertask.cc
+++ b/server/core/workertask.cc
@ -12,7 +12,7 @@
 */

 #include <maxscale/workertask.hh>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/debug.h>

 namespace maxscale
--- 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 <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/platform.h>

--- a/server/modules/filter/dbfwfilter/dbfwfilter.cc
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc
@ -69,7 +69,7 @@
 #include <sstream>
 #include <map>

-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/modutil.h>
 #include <maxscale/log_manager.h>
--- a/server/modules/filter/mqfilter/mqfilter.cc
+++ b/server/modules/filter/mqfilter/mqfilter.cc
@ -67,7 +67,7 @@
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 #include <amqp_tcp_socket.h>
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@ -38,7 +38,7 @@
 #include <string>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/filter.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>
--- a/server/modules/filter/regexfilter/regexfilter.cc
+++ b/server/modules/filter/regexfilter/regexfilter.cc
@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/filter.h>
 #include <maxscale/log_manager.h>
--- a/server/modules/filter/topfilter/topfilter.cc
+++ b/server/modules/filter/topfilter/topfilter.cc
@ -44,7 +44,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <regex.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/alloc.h>

 /*
--- a/server/modules/filter/tpmfilter/tpmfilter.cc
+++ b/server/modules/filter/tpmfilter/tpmfilter.cc
@ -61,7 +61,7 @@
 #include <maxscale/modutil.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/server.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/query_classifier.h>

 /* The maximum size for query statements in a transaction (64MB) */
--- a/server/modules/include/cdc.h
+++ b/server/modules/include/cdc.h
@ -36,7 +36,7 @@
 #include <arpa/inet.h>
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>

 MXS_BEGIN_DECLS

--- a/server/modules/protocol/HTTPD/httpd.h
+++ b/server/modules/protocol/HTTPD/httpd.h
@ -36,7 +36,7 @@
 #include <arpa/inet.h>
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>

 MXS_BEGIN_DECLS

--- a/server/modules/protocol/maxscaled/maxscaled.cc
+++ b/server/modules/protocol/maxscaled/maxscaled.cc
@ -32,7 +32,7 @@
 #include <arpa/inet.h>
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>
--- a/server/modules/protocol/telnetd/telnetd.cc
+++ b/server/modules/protocol/telnetd/telnetd.cc
@ -30,7 +30,7 @@
 #include <arpa/inet.h>
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@ -29,7 +29,7 @@
 #include <ini.h>
 #include <avro/errors.h>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modulecmd.h>
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@ -27,7 +27,7 @@
 #include <maxscale/service.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
--- a/server/modules/routing/avrorouter/avro_main.cc
+++ b/server/modules/routing/avrorouter/avro_main.cc
@ -24,7 +24,7 @@
 #include <ini.h>
 #include <sys/stat.h>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modulecmd.h>
--- a/server/modules/routing/binlogrouter/blr.cc
+++ b/server/modules/routing/binlogrouter/blr.cc
@ -37,7 +37,7 @@
 #include <uuid/uuid.h>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
--- a/server/modules/routing/binlogrouter/blr_cache.cc
+++ b/server/modules/routing/binlogrouter/blr_cache.cc
@ -32,7 +32,7 @@
 #include <maxscale/service.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
--- a/server/modules/routing/binlogrouter/blr_file.cc
+++ b/server/modules/routing/binlogrouter/blr_file.cc
@ -29,7 +29,7 @@
 #include <unistd.h>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/dcb.h>
 #include <maxscale/encryption.h>
 #include <maxscale/log_manager.h>
--- a/server/modules/routing/binlogrouter/blr_master.cc
+++ b/server/modules/routing/binlogrouter/blr_master.cc
@ -39,7 +39,7 @@
 #include <sstream>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/buffer.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
--- a/server/modules/routing/binlogrouter/blr_slave.cc
+++ b/server/modules/routing/binlogrouter/blr_slave.cc
@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <zlib.h>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/clock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/housekeeper.h>
--- a/server/modules/routing/binlogrouter/test/testbinlog.cc
+++ b/server/modules/routing/binlogrouter/test/testbinlog.cc
@ -31,7 +31,7 @@
 #include <time.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@ -34,7 +34,7 @@
 #include <maxscale/session.h>
 #include <maxscale/router.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/alloc.h>
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@ -33,7 +33,7 @@
 #include <maxscale/session.h>
 #include <maxscale/router.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/alloc.h>
--- a/server/modules/routing/debugcli/debugcmd.cc
+++ b/server/modules/routing/debugcli/debugcmd.cc
@ -37,7 +37,7 @@

 #include <maxscale/adminusers.h>
 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/buffer.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
--- a/server/modules/routing/hintrouter/dcb.cc
+++ b/server/modules/routing/hintrouter/dcb.cc
@ -12,7 +12,7 @@
 */

 #include "dcb.hh"
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/service.h>

 Dcb::Dcb(DCB* pDcb)
--- a/server/modules/routing/maxinfo/maxinfo.cc
+++ b/server/modules/routing/maxinfo/maxinfo.cc
@ -40,7 +40,7 @@
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/monitor.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/maxscale.h>
--- a/server/modules/routing/maxinfo/maxinfo_error.cc
+++ b/server/modules/routing/maxinfo/maxinfo_error.cc
@ -34,7 +34,7 @@
 #include <maxscale/router.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
--- a/server/modules/routing/maxinfo/maxinfo_exec.cc
+++ b/server/modules/routing/maxinfo/maxinfo_exec.cc
@ -32,7 +32,7 @@
 #include <inttypes.h>

 #include <maxscale/alloc.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
--- a/server/modules/routing/maxinfo/maxinfo_parse.cc
+++ b/server/modules/routing/maxinfo/maxinfo_parse.cc
@ -36,7 +36,7 @@
 #include <maxscale/router.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
--- a/server/modules/routing/readconnroute/readconnroute.cc
+++ b/server/modules/routing/readconnroute/readconnroute.cc
@ -81,7 +81,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
-#include <maxscale/atomic.h>
+#include <maxbase/atomic.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/modinfo.h>