hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename readconnroute structures

Browse Source 
Renamed them with the C++ coding style in mind.
This commit is contained in:
Markus Mäkelä
2019-01-08 10:30:30 +02:00
parent 5da833187c
commit b30b743455
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/modules/routing/readconnroute/readconnroute.cc
View File

@ -160,7 +160,7 @@ extern "C" MXS_MODULE* MXS_CREATE_MODULE()
return &info; return &info;
} }
static inline void free_readconn_instance(ROUTER_INSTANCE* router) static inline void free_readconn_instance(ReadConn* router)
{ {
if (router) if (router)
{ {
@ -170,7 +170,7 @@ static inline void free_readconn_instance(ROUTER_INSTANCE* router)
static bool configureInstance(MXS_ROUTER* instance, MXS_CONFIG_PARAMETER* params) static bool configureInstance(MXS_ROUTER* instance, MXS_CONFIG_PARAMETER* params)
{ {
ROUTER_INSTANCE* inst = static_cast<ROUTER_INSTANCE*>(instance); ReadConn* inst = static_cast<ReadConn*>(instance);
uint64_t bitmask = 0; uint64_t bitmask = 0;
uint64_t bitvalue = 0; uint64_t bitvalue = 0;
bool ok = true; bool ok = true;
@ -239,7 +239,7 @@ static bool configureInstance(MXS_ROUTER* instance, MXS_CONFIG_PARAMETER* params
*/ */
static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params) static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params)
{ {
ROUTER_INSTANCE* inst = static_cast<ROUTER_INSTANCE*>(MXS_CALLOC(1, sizeof(ROUTER_INSTANCE))); ReadConn* inst = static_cast<ReadConn*>(MXS_CALLOC(1, sizeof(ReadConn)));
if (inst) if (inst)
{ {
@ -266,8 +266,8 @@ static MXS_ROUTER* createInstance(SERVICE* service, MXS_CONFIG_PARAMETER* params
*/ */
static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* instance, MXS_SESSION* session) static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* instance, MXS_SESSION* session)
{ {
ROUTER_INSTANCE* inst = (ROUTER_INSTANCE*) instance; ReadConn* inst = (ReadConn*) instance;
ROUTER_CLIENT_SES* client_rses; ReadConnSession* client_rses;
SERVER_REF* candidate = NULL; SERVER_REF* candidate = NULL;
SERVER_REF* master_host = NULL; SERVER_REF* master_host = NULL;
@ -277,7 +277,7 @@ static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* instance, MXS_SESSION* session
session, session,
inst); inst);
client_rses = (ROUTER_CLIENT_SES*) MXS_CALLOC(1, sizeof(ROUTER_CLIENT_SES)); client_rses = (ReadConnSession*) MXS_CALLOC(1, sizeof(ReadConnSession));
if (client_rses == NULL) if (client_rses == NULL)
{ {
@ -451,8 +451,8 @@ static MXS_ROUTER_SESSION* newSession(MXS_ROUTER* instance, MXS_SESSION* session
*/ */
static void freeSession(MXS_ROUTER* router_instance, MXS_ROUTER_SESSION* router_client_ses) static void freeSession(MXS_ROUTER* router_instance, MXS_ROUTER_SESSION* router_client_ses)
{ {
ROUTER_INSTANCE* router = (ROUTER_INSTANCE*) router_instance; ReadConn* router = (ReadConn*) router_instance;
ROUTER_CLIENT_SES* router_cli_ses = (ROUTER_CLIENT_SES*) router_client_ses; ReadConnSession* router_cli_ses = (ReadConnSession*) router_client_ses;
MXB_AT_DEBUG(int prev_val = ) mxb::atomic::add(&router_cli_ses->backend->connections, MXB_AT_DEBUG(int prev_val = ) mxb::atomic::add(&router_cli_ses->backend->connections,
-1, -1,
@ -471,7 +471,7 @@ static void freeSession(MXS_ROUTER* router_instance, MXS_ROUTER_SESSION* router_
*/ */
static void closeSession(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_session) static void closeSession(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_session)
{ {
ROUTER_CLIENT_SES* router_cli_ses = (ROUTER_CLIENT_SES*) router_session; ReadConnSession* router_cli_ses = (ReadConnSession*) router_session;
mxb_assert(router_cli_ses->backend_dcb); mxb_assert(router_cli_ses->backend_dcb);
dcb_close(router_cli_ses->backend_dcb); dcb_close(router_cli_ses->backend_dcb);
} }
@ -479,7 +479,7 @@ static void closeSession(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_sessio
/** Log routing failure due to closed session */ /** Log routing failure due to closed session */
static void log_closed_session(mxs_mysql_cmd_t mysql_command, SERVER_REF* ref) static void log_closed_session(mxs_mysql_cmd_t mysql_command, SERVER_REF* ref)
{ {
char msg[SERVER::MAX_ADDRESS_LEN + 200] = ""; // Extra space for message char msg[SERVER::MAX_ADDRESS_LEN + 200] = ""; // Extra space for message
if (ref->server->is_down()) if (ref->server->is_down())
{ {
@ -505,7 +505,7 @@ static void log_closed_session(mxs_mysql_cmd_t mysql_command, SERVER_REF* ref)
* *
* @return True if the backend connection is still valid * @return True if the backend connection is still valid
*/ */
static inline bool connection_is_valid(ROUTER_INSTANCE* inst, ROUTER_CLIENT_SES* router_cli_ses) static inline bool connection_is_valid(ReadConn* inst, ReadConnSession* router_cli_ses)
{ {
bool rval = false; bool rval = false;
@ -552,8 +552,8 @@ static inline bool connection_is_valid(ROUTER_INSTANCE* inst, ROUTER_CLIENT_SES*
*/ */
static int routeQuery(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_session, GWBUF* queue) static int routeQuery(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_session, GWBUF* queue)
{ {
ROUTER_INSTANCE* inst = (ROUTER_INSTANCE*) instance; ReadConn* inst = (ReadConn*) instance;
ROUTER_CLIENT_SES* router_cli_ses = (ROUTER_CLIENT_SES*) router_session; ReadConnSession* router_cli_ses = (ReadConnSession*) router_session;
int rc = 0; int rc = 0;
MySQLProtocol* proto = (MySQLProtocol*)router_cli_ses->client_dcb->protocol; MySQLProtocol* proto = (MySQLProtocol*)router_cli_ses->client_dcb->protocol;
mxs_mysql_cmd_t mysql_command = proto->current_command; mxs_mysql_cmd_t mysql_command = proto->current_command;
@ -612,7 +612,7 @@ static int routeQuery(MXS_ROUTER* instance, MXS_ROUTER_SESSION* router_session,
*/ */
static void diagnostics(MXS_ROUTER* router, DCB* dcb) static void diagnostics(MXS_ROUTER* router, DCB* dcb)
{ {
ROUTER_INSTANCE* router_inst = (ROUTER_INSTANCE*) router; ReadConn* router_inst = (ReadConn*) router;
const char* weightby = serviceGetWeightingParameter(router_inst->service); const char* weightby = serviceGetWeightingParameter(router_inst->service);
dcb_printf(dcb, dcb_printf(dcb,
@ -651,7 +651,7 @@ static void diagnostics(MXS_ROUTER* router, DCB* dcb)
*/ */
static json_t* diagnostics_json(const MXS_ROUTER* router) static json_t* diagnostics_json(const MXS_ROUTER* router)
{ {
ROUTER_INSTANCE* router_inst = (ROUTER_INSTANCE*)router; ReadConn* router_inst = (ReadConn*)router;
json_t* rval = json_object(); json_t* rval = json_object();
json_object_set_new(rval, "connections", json_integer(router_inst->stats.n_sessions)); json_object_set_new(rval, "connections", json_integer(router_inst->stats.n_sessions));

12
server/modules/routing/readconnroute/readconnroute.hh
View File

@ -26,7 +26,7 @@
/** /**
* The client session structure used within this router. * The client session structure used within this router.
*/ */
struct ROUTER_CLIENT_SES : MXS_ROUTER_SESSION struct ReadConnSession : MXS_ROUTER_SESSION
{ {
SERVER_REF* backend; /*< Backend used by the client session */ SERVER_REF* backend; /*< Backend used by the client session */
DCB* backend_dcb;/*< DCB Connection to the backend */ DCB* backend_dcb;/*< DCB Connection to the backend */
@ -38,7 +38,7 @@ struct ROUTER_CLIENT_SES : MXS_ROUTER_SESSION
/** /**
* The statistics for this router instance * The statistics for this router instance
*/ */
struct ROUTER_STATS struct Stats
{ {
int n_sessions; /*< Number sessions created */ int n_sessions; /*< Number sessions created */
int n_queries; /*< Number of queries forwarded */ int n_queries; /*< Number of queries forwarded */
@ -47,9 +47,9 @@ struct ROUTER_STATS
/** /**
* The per instance data for the router. * The per instance data for the router.
*/ */
struct ROUTER_INSTANCE : public MXS_ROUTER struct ReadConn : public MXS_ROUTER
{ {
SERVICE* service; /*< Pointer to the service using this router */ SERVICE* service; /*< Pointer to the service using this router */
uint64_t bitmask_and_bitvalue; /*< Lower 32-bits for bitmask and upper for bitvalue */ uint64_t bitmask_and_bitvalue; /*< Lower 32-bits for bitmask and upper for bitvalue */
ROUTER_STATS stats; /*< Statistics for this router */ Stats stats; /*< Statistics for this router */
}; };