From 5604023b26d723e26d45d3a1db124c52b356eff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 9 Jul 2018 09:09:47 +0300 Subject: [PATCH] Clean up readconnroute structures Removed unused member variables and reduced debug output. --- .../routing/readconnroute/readconnection.h | 42 ++++++------------- .../routing/readconnroute/readconnroute.cc | 22 ---------- 2 files changed, 13 insertions(+), 51 deletions(-) diff --git a/server/modules/routing/readconnroute/readconnection.h b/server/modules/routing/readconnroute/readconnection.h index 6880d87a7..49343bf25 100644 --- a/server/modules/routing/readconnroute/readconnection.h +++ b/server/modules/routing/readconnroute/readconnection.h @@ -1,6 +1,4 @@ #pragma once -#ifndef _READCONNECTION_H -#define _READCONNECTION_H /* * Copyright (c) 2016 MariaDB Corporation Ab * @@ -32,53 +30,39 @@ #include #include #include - -MXS_BEGIN_DECLS +#include /** * The client session structure used within this router. */ -typedef struct router_client_session +struct ROUTER_CLIENT_SES: MXS_ROUTER_SESSION { -#if defined(SS_DEBUG) - skygw_chk_t rses_chk_top; -#endif SPINLOCK rses_lock; /*< protects rses_deleted */ int rses_versno; /*< even = no active update, else odd */ bool rses_closed; /*< true when closeSession is called */ SERVER_REF *backend; /*< Backend used by the client session */ DCB *backend_dcb; /*< DCB Connection to the backend */ DCB *client_dcb; /**< Client DCB */ - unsigned int bitvalue; /*< Session specific required value of server->status */ - struct router_client_session *next; -#if defined(SS_DEBUG) - skygw_chk_t rses_chk_tail; -#endif -} ROUTER_CLIENT_SES; + uint32_t bitvalue; /*< Session specific required value of server->status */ +}; /** * The statistics for this router instance */ -typedef struct +struct ROUTER_STATS { int n_sessions; /*< Number sessions created */ - int n_queries; /*< Number of queries forwarded */ -} ROUTER_STATS; + int n_queries; /*< Number of queries forwarded */ +}; /** * The per instance data for the router. */ -typedef struct router_instance +struct ROUTER_INSTANCE: public MXS_ROUTER { - SERVICE *service; /*< Pointer to the service using this router */ - SPINLOCK lock; /*< Spinlock for the instance data */ - unsigned int bitmask; /*< Bitmask to apply to server->status */ - unsigned int bitvalue; /*< Required value of server->status */ + SERVICE *service; /*< Pointer to the service using this router */ + SPINLOCK lock; /*< Spinlock for the instance data */ + uint32_t bitmask; /*< Bitmask to apply to server->status */ + uint32_t bitvalue; /*< Required value of server->status */ ROUTER_STATS stats; /*< Statistics for this router */ - struct router_instance - *next; -} ROUTER_INSTANCE; - -MXS_END_DECLS - -#endif +}; diff --git a/server/modules/routing/readconnroute/readconnroute.cc b/server/modules/routing/readconnroute/readconnroute.cc index e65c5f686..84f0ed5af 100644 --- a/server/modules/routing/readconnroute/readconnroute.cc +++ b/server/modules/routing/readconnroute/readconnroute.cc @@ -265,7 +265,6 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session) ROUTER_INSTANCE *inst = (ROUTER_INSTANCE *) instance; ROUTER_CLIENT_SES *client_rses; SERVER_REF *candidate = NULL; - int i; SERVER_REF *master_host = NULL; MXS_DEBUG("%lu [newSession] new router session with session " @@ -281,10 +280,6 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session) return NULL; } -#if defined(SS_DEBUG) - client_rses->rses_chk_top = CHK_NUM_ROUTER_SES; - client_rses->rses_chk_tail = CHK_NUM_ROUTER_SES; -#endif client_rses->client_dcb = session->client_dcb; client_rses->bitvalue = inst->bitvalue; @@ -317,17 +312,6 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session) { continue; } - else - { - MXS_DEBUG("%lu [newSession] Examine server in port %d with " - "%d connections. Status is %s, " - "inst->bitvalue is %d", - pthread_self(), - ref->server->port, - ref->connections, - STRSRVSTATUS(ref->server), - inst->bitmask); - } /* Check server status bits against bitvalue from router_options */ if (ref && SERVER_IS_RUNNING(ref->server) && @@ -440,8 +424,6 @@ newSession(MXS_ROUTER *instance, MXS_SESSION *session) inst->stats.n_sessions++; - CHK_CLIENT_RSES(client_rses); - MXS_INFO("New session for server %s. Connections : %d", candidate->server->name, candidate->connections); @@ -489,7 +471,6 @@ closeSession(MXS_ROUTER *instance, MXS_ROUTER_SESSION *router_session) ROUTER_CLIENT_SES *router_cli_ses = (ROUTER_CLIENT_SES *) router_session; DCB* backend_dcb; - CHK_CLIENT_RSES(router_cli_ses); /** * Lock router client session for secure read and update. */ @@ -812,8 +793,6 @@ static bool rses_begin_locked_router_action(ROUTER_CLIENT_SES* rses) { bool succp = false; - CHK_CLIENT_RSES(rses); - if (rses->rses_closed) { goto return_succp; @@ -847,7 +826,6 @@ return_succp: */ static void rses_end_locked_router_action(ROUTER_CLIENT_SES* rses) { - CHK_CLIENT_RSES(rses); spinlock_release(&rses->rses_lock); }