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

MXS-2196: Rename struct session to struct MXS_SESSION

Browse Source
This commit is contained in:
Markus Mäkelä
2018-12-03 09:17:19 +02:00
parent da9816b7e7
commit a2f5cc9d09
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/Design-Documents/Plugin-development-guide.md
View File

@ -232,10 +232,10 @@ int32_t write_ready(struct dcb *)
int32_t error(struct dcb *) int32_t error(struct dcb *)
int32_t hangup(struct dcb *) int32_t hangup(struct dcb *)
int32_t accept(struct dcb *) int32_t accept(struct dcb *)
int32_t connect(struct dcb *, struct server *, struct session *) int32_t connect(struct dcb*, struct server*, MXS_SESSION*)
int32_t close(struct dcb *) int32_t close(struct dcb *)
int32_t listen(struct dcb *, char *) int32_t listen(struct dcb *, char *)
int32_t auth(struct dcb *, struct server *, struct session *, GWBUF *) int32_t auth(struct dcb*, struct server*, MXS_SESSION*, GWBUF*)
int32_t session(struct dcb *, void *) int32_t session(struct dcb *, void *)
char auth_default() char auth_default()
int32_t connlimit(struct dcb *, int limit) int32_t connlimit(struct dcb *, int limit)

2
include/maxscale/authenticator.h
View File

@ -45,7 +45,7 @@ typedef enum authenticator_capability
struct DCB; struct DCB;
struct server; struct server;
struct session; struct MXS_SESSION;
/** /**
* @verbatim * @verbatim

6
include/maxscale/dcb.hh
View File

@ -36,7 +36,7 @@ MXS_BEGIN_DECLS
#define ERRHANDLE #define ERRHANDLE
struct session; struct MXS_SESSION;
struct server; struct server;
struct DCB; struct DCB;
@ -172,7 +172,7 @@ struct DCB : public MXB_POLL_DATA
void* protocol = nullptr; /**< The protocol specific state */ void* protocol = nullptr; /**< The protocol specific state */
size_t protocol_packet_length = 0; /**< protocol packet length */ size_t protocol_packet_length = 0; /**< protocol packet length */
size_t protocol_bytes_processed = 0; /**< How many bytes have been read */ size_t protocol_bytes_processed = 0; /**< How many bytes have been read */
struct session* session; /**< The owning session */ MXS_SESSION* session; /**< The owning session */
SListener listener; /**< The origin of the connection */ SListener listener; /**< The origin of the connection */
MXS_PROTOCOL func = {}; /**< Protocol functions for the DCB */ MXS_PROTOCOL func = {}; /**< Protocol functions for the DCB */
MXS_AUTHENTICATOR authfunc = {}; /**< Authenticator functions for the DCB */ MXS_AUTHENTICATOR authfunc = {}; /**< Authenticator functions for the DCB */
@ -244,7 +244,7 @@ void dcb_global_init();
int dcb_write(DCB*, GWBUF*); int dcb_write(DCB*, GWBUF*);
DCB* dcb_alloc(dcb_role_t, const SListener&, SERVICE* service); DCB* dcb_alloc(dcb_role_t, const SListener&, SERVICE* service);
DCB* dcb_connect(struct server*, struct session*, const char*); DCB* dcb_connect(struct server*, MXS_SESSION*, const char*);
int dcb_read(DCB*, GWBUF**, int); int dcb_read(DCB*, GWBUF**, int);
int dcb_drain_writeq(DCB*); int dcb_drain_writeq(DCB*);
void dcb_close(DCB*); void dcb_close(DCB*);

6
include/maxscale/protocol.h
View File

@ -27,7 +27,7 @@ MXS_BEGIN_DECLS
struct DCB; struct DCB;
struct server; struct server;
struct session; struct MXS_SESSION;
/** /**
* Protocol module API * Protocol module API
@ -106,7 +106,7 @@ typedef struct mxs_protocol
* *
* @return The opened file descriptor or DCBFD_CLOSED on error * @return The opened file descriptor or DCBFD_CLOSED on error
*/ */
int32_t (* connect)(DCB* dcb, struct server* server, struct session* session); int32_t (* connect)(DCB* dcb, struct server* server, MXS_SESSION* session);
/** /**
* Free protocol data allocated in the connect handler * Free protocol data allocated in the connect handler
@ -131,7 +131,7 @@ typedef struct mxs_protocol
* *
* @note Currently the return value is ignored * @note Currently the return value is ignored
*/ */
int32_t (* auth)(DCB* dcb, struct server* server, struct session* session, GWBUF* buffer); int32_t (* auth)(DCB* dcb, struct server* server, MXS_SESSION* session, GWBUF* buffer);
/** /**
* Returns the name of the default authenticator module for this protocol * Returns the name of the default authenticator module for this protocol

4
include/maxscale/session.hh
View File

@ -205,7 +205,7 @@ typedef char* (* session_variable_handler_t)(void* context,
* Note that the first few fields (up to and including "entry_is_ready") must * Note that the first few fields (up to and including "entry_is_ready") must
* precisely match the LIST_ENTRY structure defined in the list manager. * precisely match the LIST_ENTRY structure defined in the list manager.
*/ */
typedef struct session struct MXS_SESSION
{ {
mxs_session_state_t state; /*< Current descriptor state */ mxs_session_state_t state; /*< Current descriptor state */
uint64_t ses_id; /*< Unique session identifier */ uint64_t ses_id; /*< Unique session identifier */
@ -229,7 +229,7 @@ typedef struct session
} response; /*< Shortcircuited response */ } response; /*< Shortcircuited response */
session_close_t close_reason; /*< Reason why the session was closed */ session_close_t close_reason; /*< Reason why the session was closed */
bool load_active; /*< Data streaming state (for LOAD DATA LOCAL INFILE) */ bool load_active; /*< Data streaming state (for LOAD DATA LOCAL INFILE) */
} MXS_SESSION; };
/** /**
* A filter that terminates the request processing and delivers a response * A filter that terminates the request processing and delivers a response

6
server/core/session.cc
View File

@ -69,9 +69,9 @@ struct
SESSION_DUMP_STATEMENTS_NEVER SESSION_DUMP_STATEMENTS_NEVER
}; };
static struct session dummy_session() static MXS_SESSION dummy_session()
{ {
struct session session = {}; MXS_SESSION session = {};
session.state = SESSION_STATE_DUMMY; session.state = SESSION_STATE_DUMMY;
session.refcount = 1; session.refcount = 1;
return session; return session;
@ -79,7 +79,7 @@ static struct session dummy_session()
} }
static struct session session_dummy_struct = dummy_session(); static MXS_SESSION session_dummy_struct = dummy_session();
static void session_initialize(void* session); static void session_initialize(void* session);
static int session_setup_filters(MXS_SESSION* session); static int session_setup_filters(MXS_SESSION* session);