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

Removed unnecessary code from dcb_close and dcb_set_state_nomutex.

Browse Source
This commit is contained in:
Markus Makela
2015-06-23 11:25:59 +03:00
parent c22c6ea46a
commit dc43a7d9da
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/dcb.c
View File

@ -1949,15 +1949,13 @@ dcb_close(DCB *dcb)
} }
ss_dassert(dcb->state == DCB_STATE_POLLING || ss_dassert(dcb->state == DCB_STATE_POLLING ||
dcb->state == DCB_STATE_LISTENING ||
dcb->state == DCB_STATE_NOPOLLING || dcb->state == DCB_STATE_NOPOLLING ||
dcb->state == DCB_STATE_ZOMBIE); dcb->state == DCB_STATE_ZOMBIE);
/*< /*<
* Stop dcb's listening and modify state accordingly. * Stop dcb's listening and modify state accordingly.
*/ */
if (dcb->state == DCB_STATE_POLLING || if (dcb->state == DCB_STATE_POLLING)
dcb->state == DCB_STATE_LISTENING)
{ {
rc = poll_remove_dcb(dcb); rc = poll_remove_dcb(dcb);
@ -2430,10 +2428,6 @@ static bool dcb_set_state_nomutex(
case DCB_STATE_POLLING: /*< ok to try but state can't change */ case DCB_STATE_POLLING: /*< ok to try but state can't change */
succp = true; succp = true;
break; break;
case DCB_STATE_LISTENING:
dcb->state = new_state;
succp = true;
break;
default: default:
ss_dassert(old_state != NULL); ss_dassert(old_state != NULL);
break; break;