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

Wrap spinlock around more logic; simplify process zombies list logic.

Browse Source
This commit is contained in:
counterpoint
2015-07-07 08:37:29 +01:00
parent 9ee8d11808
commit 5577ef94e9
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/dcb.c
View File

@ -484,14 +484,13 @@ bool succp = false;
/*< /*<
* Move dcb to linked list of victim dcbs. * Move dcb to linked list of victim dcbs.
*/ */
ptr->memdata.next = NULL;
if (dcb_list == NULL) { if (dcb_list == NULL) {
dcb_list = ptr; dcb_list = ptr;
dcb = dcb_list;
} else { } else {
dcb->memdata.next = ptr; dcb->memdata.next = ptr;
dcb = dcb->memdata.next;
} }
dcb->memdata.next = NULL; dcb = ptr;
ptr = tptr; ptr = tptr;
} }
else else
@ -1963,10 +1962,10 @@ dcb_close(DCB *dcb)
/** Call possible callback for this DCB in case of close */ /** Call possible callback for this DCB in case of close */
dcb_call_callback(dcb, DCB_REASON_CLOSE); dcb_call_callback(dcb, DCB_REASON_CLOSE);
} }
spinlock_acquire(&zombiespin);
if (dcb->state == DCB_STATE_NOPOLLING || dcb->state == DCB_STATE_ALLOC); if (dcb->state == DCB_STATE_NOPOLLING || dcb->state == DCB_STATE_ALLOC);
{ {
spinlock_acquire(&zombiespin);
/*< /*<
* Add closing dcb to the top of the list. * Add closing dcb to the top of the list.
*/ */
@ -1977,9 +1976,8 @@ dcb_close(DCB *dcb)
* list. * list.
*/ */
dcb->state = DCB_STATE_ZOMBIE; dcb->state = DCB_STATE_ZOMBIE;
spinlock_release(&zombiespin);
} }
spinlock_release(&zombiespin);
} }
/** /**