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

Delay closing in dcb_close

Browse Source 
If a dcb being closed is the dcb for which events are currently being
processed, the dcb is not closed immediately but only after all events
have been delivered.
This commit is contained in:
Johan Wikman
2017-09-01 11:03:23 +03:00
parent cfe06a563e
commit 18cb61f7de
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/core/dcb.cc
View File

@ -1039,6 +1039,15 @@ void dcb_close(DCB *dcb)
{
CHK_DCB(dcb);
#if defined(SS_DEBUG)
if (dcb->poll.thread.id != Worker::get_current_id())
{
MXS_ALERT("dcb_close(%p) called by %d, owned by %d.",
dcb, Worker::get_current_id(), dcb->poll.thread.id);
ss_dassert(dcb->poll.thread.id == Worker::get_current_id());
}
#endif
if ((DCB_STATE_UNDEFINED == dcb->state) || (DCB_STATE_DISCONNECTED == dcb->state))
{
log_illegal_dcb(dcb);
@ -1071,6 +1080,15 @@ void dcb_close(DCB *dcb)
else if (dcb->n_close == 0)
{
dcb->n_close = 1;
if (dcb != dcb_get_current())
{
// If the dcb to be closed is *not* the dcb for which event callbacks are being
// called, we close it immediately. Otherwise it will be closed once all callbacks
// have been called, in the end of dcb_process_poll_events(), which currently is
// above us in the call stack.
dcb_final_close(dcb);
}
}
else
{
@ -1082,6 +1100,14 @@ void dcb_close(DCB *dcb)
static void dcb_final_close(DCB* dcb)
{
#if defined(SS_DEBUG)
if (dcb->poll.thread.id != Worker::get_current_id())
{
MXS_ALERT("dcb_close(%p) called by %d, owned by %d.",
dcb, Worker::get_current_id(), dcb->poll.thread.id);
ss_dassert(dcb->poll.thread.id == Worker::get_current_id());
}
#endif
ss_dassert(dcb->n_close != 0);
if (dcb->dcb_role == DCB_ROLE_BACKEND_HANDLER && // Backend DCB