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/routing/avrorouter/avro.c

@@ -126,7 +126,7 @@ bool avro_handle_convert(const MODULECMD_ARG *args)
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     spinlock_init(&instlock);
     instances = NULL;
@@ -152,10 +152,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
         ROUTER_VERSION,
         "Binlogrouter",
         "V1.0.0",

server/modules/routing/binlogrouter/blr.c

@@ -134,7 +134,7 @@ static ROUTER_INSTANCE *instances;
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     MXS_NOTICE("Initialise binlog router module.");
     spinlock_init(&instlock);
@@ -154,10 +154,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         destroyInstance
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
         ROUTER_VERSION,
         "Binlogrouter",
         "V2.1.0",

server/modules/routing/cli/cli.c

@@ -62,7 +62,7 @@ static CLI_INSTANCE *instances;
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     MXS_NOTICE("Initialise CLI router module");
     spinlock_init(&instlock);
@@ -82,10 +82,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
         ROUTER_VERSION,
         "The admin user interface",
         "V1.0.0",

server/modules/routing/debugcli/debugcli.c

@@ -61,7 +61,7 @@ static CLI_INSTANCE *instances;
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     MXS_NOTICE("Initialise debug CLI router module.");
     spinlock_init(&instlock);
@@ -81,10 +81,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
         ROUTER_VERSION,
         "The debug user interface",
         "V1.1.1",

server/modules/routing/maxinfo/maxinfo.c

@@ -85,7 +85,7 @@ static INFO_INSTANCE    *instances;
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     MXS_NOTICE("Initialise MaxInfo router module.");
     spinlock_init(&instlock);
@@ -105,10 +105,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_ALPHA_RELEASE,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_ALPHA_RELEASE,
         ROUTER_VERSION,
         "The MaxScale Information Schema",
         "V1.0.0",

server/modules/routing/readconnroute/readconnroute.c

@@ -118,7 +118,7 @@ static ROUTER_INSTANCE *instances;
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     MXS_NOTICE("Initialise readconnroute router module.");
     spinlock_init(&instlock);
@@ -138,10 +138,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_GA,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_GA,
         ROUTER_VERSION,
         "A connection based router to load balance based on connections",
         "V1.1.0",

server/modules/routing/readwritesplit/readwritesplit.c

@@ -113,7 +113,7 @@ static bool create_backends(ROUTER_CLIENT_SES *rses, backend_ref_t** dest, int*
  *
  * @return The module object
  */
-MODULE_INFO *MXS_CREATE_MODULE()
+MXS_MODULE *MXS_CREATE_MODULE()
 {
     static ROUTER_OBJECT MyObject =
     {
@@ -129,9 +129,9 @@ MODULE_INFO *MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER, MODULE_GA, ROUTER_VERSION,
+        MXS_MODULE_API_ROUTER, MXS_MODULE_GA, ROUTER_VERSION,
         "A Read/Write splitting router for enhancement read scalability",
         "V1.1.0",
         &MyObject

server/modules/routing/schemarouter/schemarouter.c

@@ -591,7 +591,7 @@ bool check_shard_status(ROUTER_INSTANCE* router, char* shard)
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     MXS_NOTICE("Initializing Schema Sharding Router.");
     spinlock_init(&instlock);
@@ -611,10 +611,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_BETA_RELEASE,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_BETA_RELEASE,
         ROUTER_VERSION,
         "A database sharding router for simple sharding",
         "V1.0.0",

server/modules/routing/testroute/testroute.c

@@ -46,7 +46,7 @@ typedef struct
  *
  * @return The module object
  */
-MODULE_INFO* MXS_CREATE_MODULE()
+MXS_MODULE* MXS_CREATE_MODULE()
 {
     static ROUTER_OBJECT MyObject =
     {
@@ -62,10 +62,10 @@ MODULE_INFO* MXS_CREATE_MODULE()
         NULL
     };
 
-    static MODULE_INFO info =
+    static MXS_MODULE info =
     {
-        MODULE_API_ROUTER,
-        MODULE_IN_DEVELOPMENT,
+        MXS_MODULE_API_ROUTER,
+        MXS_MODULE_IN_DEVELOPMENT,
         ROUTER_VERSION,
         "A test router - not for use in real systems",
         "V1.0.0",