Rename MODULE_INFO to MXS_MODULE

The MODULE_INFO is now the main object which is used by modules to convey
information to the MaxScale core. The MXS_MODULE name is more apt as it
now contains the actual module definition.

The old MODULES structure was moved into load_utils.c as an internal
implementation and was renamed so that it is not confused with the new
MODULE structure.

server/modules/filter/cache/cachefilter.cc

@@ -193,7 +193,7 @@ bool config_get_uint64(const FILTER_PARAMETER& param, uint64_t* pValue)
 // Global symbols of the Module
 //
 
-extern "C" MODULE_INFO* MXS_CREATE_MODULE()
+extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
     static modulecmd_arg_type_t show_argv[] =
     {
@@ -206,10 +206,10 @@ extern "C" MODULE_INFO* MXS_CREATE_MODULE()
     
     MXS_NOTICE("Initialized cache module %s.\n", VERSION_STRING);
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_IN_DEVELOPMENT,
         FILTER_VERSION,
         "A caching filter that is capable of caching and returning cached data.",
         VERSION_STRING,

server/modules/filter/ccrfilter/ccrfilter.c

@@ -99,7 +99,7 @@ typedef struct
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -116,10 +116,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "A routing hint filter that send queries to the master after data modification",
         "V1.1.0",

server/modules/filter/dbfwfilter/dbfwfilter.c

@@ -777,7 +777,7 @@ bool dbfw_show_rules(const MODULECMD_ARG *argv)
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     modulecmd_arg_type_t args_rules_reload[] =
     {
@@ -810,10 +810,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "Firewall Filter",
         "V1.2.0",

server/modules/filter/hintfilter/hintfilter.c

@@ -40,7 +40,7 @@ static uint64_t getCapabilities(void);
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -57,10 +57,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_ALPHA_RELEASE,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_ALPHA_RELEASE,
         FILTER_VERSION,
         "A hint parsing filter",
         "V1.0.0",

server/modules/filter/luafilter/luafilter.c

@@ -72,7 +72,7 @@ static uint64_t getCapabilities(void);
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -89,10 +89,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_EXPERIMENTAL,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_EXPERIMENTAL,
         FILTER_VERSION,
         "Lua Filter",
         "V1.0.0",

server/modules/filter/masking/maskingfilter.cc

@@ -18,14 +18,14 @@
 // Global symbols of the Module
 //
 
-extern "C" MODULE_INFO* MXS_CREATE_MODULE()
+extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
     MXS_NOTICE("Initialized masking module.");
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_IN_DEVELOPMENT,
         FILTER_VERSION,
         "A masking filter that is capable of masking/obfuscating returned column values.",
         "V1.0.0",

server/modules/filter/maxrows/maxrows.c

@@ -64,7 +64,7 @@ static uint64_t getCapabilities(void);
  *
  * @return The module object.
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT object =
     {
@@ -81,10 +81,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_IN_DEVELOPMENT,
         FILTER_VERSION,
         "A filter that is capable of limiting the resultset number of rows.",
         "V1.0.0",

server/modules/filter/mqfilter/mqfilter.c

@@ -245,7 +245,7 @@ void sendMessage(void* data);
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -262,10 +262,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_ALPHA_RELEASE,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_ALPHA_RELEASE,
         FILTER_VERSION,
         "A RabbitMQ query logging filter",
         "V1.0.2",

server/modules/filter/namedserverfilter/namedserverfilter.c

@@ -80,7 +80,7 @@ typedef struct
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -97,10 +97,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "A routing hint filter that uses regular expressions to direct queries",
         "V1.1.0",

server/modules/filter/qlafilter/qlafilter.c

@@ -139,7 +139,7 @@ static int write_log_entry(uint32_t, FILE*, QLA_INSTANCE*, QLA_SESSION*, const c
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -156,10 +156,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "A simple query logging filter",
         "V1.1.1",

server/modules/filter/regexfilter/regexfilter.c

@@ -90,7 +90,7 @@ void log_nomatch(REGEX_INSTANCE* inst, char* re, char* old);
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -107,10 +107,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "A query rewrite filter that uses regular expressions to rewrite queries",
         "V1.1.0",

server/modules/filter/tee/tee.c

@@ -289,7 +289,7 @@ orphan_free(void* data)
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     spinlock_init(&orphanLock);
 #ifdef SS_DEBUG
@@ -311,10 +311,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "A tee piece in the filter plumbing",
         "V1.0.0",

server/modules/filter/testfilter/testfilter.c

@@ -69,7 +69,7 @@ typedef struct
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -86,10 +86,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         destroyInstance,
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_BETA_RELEASE,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_BETA_RELEASE,
         FILTER_VERSION,
         "A simple query counting filter",
         "V2.0.0",

server/modules/filter/topfilter/topfilter.c

@@ -123,7 +123,7 @@ typedef struct
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -140,10 +140,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "A top N query logging filter",
         "V1.0.1",

server/modules/filter/tpmfilter/tpmfilter.c

@@ -142,7 +142,7 @@ typedef struct
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static FILTER_OBJECT MyObject =
     {
@@ -159,10 +159,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL, // No destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_FILTER,
-        MODULE_GA,
+        MXS_MODULE_API_FILTER,
+        MXS_MODULE_GA,
         FILTER_VERSION,
         "Transaction Performance Monitoring filter",
         "V1.0.1",