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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2019-10-10 21:42:43 +03:00
parent c2fc541ea4 183673b026
commit dc895e41ad
12 changed files with 854 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/core/session.cc
View File

@ -62,7 +62,7 @@ struct
uint64_t next_session_id;
uint32_t retain_last_statements;
session_dump_statements_t dump_statements;
uint32_t session_trace;
uint32_t session_trace;
} this_unit =
{
1,
@ -160,7 +160,6 @@ bool session_start(MXS_SESSION* session)
session->state = SESSION_STATE_STARTED;
mxb::atomic::add(&session->service->stats.n_sessions, 1, mxb::atomic::RELAXED);
mxb::atomic::add(&session->service->stats.n_current, 1, mxb::atomic::RELAXED);
MXS_INFO("Started %s client session [%" PRIu64 "] for '%s' from %s",
session->service->name(), session->ses_id,
@ -279,8 +278,6 @@ static void session_final_free(MXS_SESSION* ses)
session->state = SESSION_STATE_TO_BE_FREED;
mxb::atomic::add(&session->service->stats.n_current, -1, mxb::atomic::RELAXED);
if (session->client_dcb)
{
dcb_free_all_memory(session->client_dcb);
@ -1162,6 +1159,9 @@ Session::Session(const SListener& listener)
{
m_retain_last_statements = this_unit.retain_last_statements;
}
mxb::atomic::add(&service->stats.n_current, 1, mxb::atomic::RELAXED);
mxb_assert(service->stats.n_current >= 0);
}
Session::~Session()
@ -1176,6 +1176,9 @@ Session::~Session()
f.filter->obj->closeSession(f.instance, f.session);
f.filter->obj->freeSession(f.instance, f.session);
}
mxb::atomic::add(&service->stats.n_current, -1, mxb::atomic::RELAXED);
mxb_assert(service->stats.n_current >= 0);
}
void Session::set_client_dcb(DCB* dcb)
@ -1696,6 +1699,6 @@ void Session::dump_session_log()
log += s;
}
MXS_NOTICE("Session log for session (%" PRIu64"): \n%s ", ses_id, log.c_str());
MXS_NOTICE("Session log for session (%" PRIu64 "): \n%s ", ses_id, log.c_str());
}
}
}