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

MXS-1929: Add Session class

Browse Source 
The Session class now contains all of the C++ objects that were previously
in the MXS_SESSION struct. It is also allocated with new but all
initialization is still done outside of the Session in session_alloc_body.

This commit will not compile as it is a part of a set of commits that make
parts of the session private.
This commit is contained in:
Markus Mäkelä
2018-08-03 12:39:54 +03:00
parent 710f2d3c79
commit 945510e735
5 changed files with 58 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/maxscale/session.h
View File

@ -27,19 +27,6 @@
#include <maxscale/spinlock.h>
#include <maxscale/jansson.h>
#ifdef __cplusplus
#include <unordered_map>
#include <unordered_set>
#include <string>
#include <deque>
#include <vector>
typedef std::deque<std::vector<uint8_t> > SessionStmtQueue;
typedef std::unordered_set<DCB*> DCBSet;
#else
typedef void SessionStmtQueue;
typedef void DCBSet;
#endif
MXS_BEGIN_DECLS
struct dcb;
@ -177,18 +164,6 @@ typedef char* (*session_variable_handler_t)(void* context,
const char* value_begin,
const char* value_end);
#ifdef __cplusplus
typedef struct session_variable
{
session_variable_handler_t handler;
void* context;
} SESSION_VARIABLE;
typedef std::unordered_map<std::string, SESSION_VARIABLE> SessionVarsByName;
#else
typedef void SessionVarsByName;
#endif
/**
* The session status block
*
@ -218,14 +193,11 @@ typedef struct session
bool autocommit; /*< Whether autocommit is on. */
intptr_t client_protocol_data; /*< Owned and managed by the client protocol. */
bool qualifies_for_pooling; /**< Whether this session qualifies for the connection pool */
SessionVarsByName* variables; /*< @maxscale variables associated with this session */
struct
{
MXS_UPSTREAM up; /*< Upward component to receive buffer. */
GWBUF* buffer; /*< Buffer to deliver to up. */
} response; /*< Shortcircuited response */
SessionStmtQueue* last_statements; /*< The N last statements by the client */
DCBSet* dcb_set; /*< Set of associated backend DCBs */
session_close_t close_reason; /*< Reason why the session was closed */
skygw_chk_t ses_chk_tail;
} MXS_SESSION;