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

Rename session_link_dcb to session_link_backend_dcb

Browse Source 
Reduce risk for confusion.
This commit is contained in:
Johan Wikman
2017-09-07 15:51:48 +03:00
parent 80815e0f54
commit 9da1439b0e
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/dcb.cc
View File

@ -389,7 +389,7 @@ dcb_connect(SERVER *server, MXS_SESSION *session, const char *protocol)
/** /**
* Link dcb to session. Unlink is called in dcb_final_free * Link dcb to session. Unlink is called in dcb_final_free
*/ */
session_link_dcb(session, dcb); session_link_backend_dcb(session, dcb);
MXS_DEBUG("Reusing a persistent connection, dcb %p", dcb); MXS_DEBUG("Reusing a persistent connection, dcb %p", dcb);
dcb->persistentstart = 0; dcb->persistentstart = 0;
@ -438,7 +438,7 @@ dcb_connect(SERVER *server, MXS_SESSION *session, const char *protocol)
/** /**
* Link dcb to session. Unlink is called in dcb_final_free * Link dcb to session. Unlink is called in dcb_final_free
*/ */
session_link_dcb(session, dcb); session_link_backend_dcb(session, dcb);
fd = dcb->func.connect(dcb, server, session); fd = dcb->func.connect(dcb, server, session);

6
server/core/maxscale/session.h
View File

@ -44,12 +44,12 @@ int session_isvalid(MXS_SESSION *);
const char *session_state(mxs_session_state_t); const char *session_state(mxs_session_state_t);
/** /**
* Link a session to a DCB. * Link a session to a backend DCB.
* *
* @param session The session to link with the dcb * @param session The session to link with the dcb
* @param dcb The DCB to be linked * @param dcb The backend DCB to be linked
*/ */
void session_link_dcb(MXS_SESSION *session, struct dcb *dcb); void session_link_backend_dcb(MXS_SESSION *session, struct dcb *dcb);
RESULTSET *sessionGetList(SESSIONLISTFILTER); RESULTSET *sessionGetList(SESSIONLISTFILTER);

6
server/core/session.cc
View File

@ -314,11 +314,9 @@ session_set_dummy(DCB *client_dcb)
return session; return session;
} }
void session_link_dcb(MXS_SESSION *session, DCB *dcb) void session_link_backend_dcb(MXS_SESSION *session, DCB *dcb)
{ {
ss_info_dassert(session->state != SESSION_STATE_FREE, ss_dassert(dcb->dcb_role == DCB_ROLE_BACKEND_HANDLER);
"If session->state is SESSION_STATE_FREE then this attempt to "
"access freed memory block.");
atomic_add(&session->refcount, 1); atomic_add(&session->refcount, 1);
dcb->session = session; dcb->session = session;