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

Simplify logic in processing of zombies list, to bring more into line with develop branch and reduce conflicts when merged.

Browse Source
This commit is contained in:
counterpoint 2015-07-08 09:26:21 +01:00
parent b8abfd22f4
commit 4cea1b68c0
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/dcb.c
View File

@ -495,7 +495,7 @@ bool succp = false;
* zombiedcb is the DCB we are processing
* previousdcb is the previous DCB on the zombie
* queue or NULL if the DCB is at the head of the
* queue
* queue. Remove zombiedcb from the zombies list.
*/
if (previousdcb == NULL)
zombies = zombiedcb->memdata.next;
@ -512,22 +512,34 @@ bool succp = false;
zombiedcb->fd,
STRDCBSTATE(zombiedcb->state))));
ss_info_dassert(zombiedcb->state == DCB_STATE_ZOMBIE,
"dcb not in DCB_STATE_ZOMBIE state.");
"dcb not in DCB_STATE_ZOMBIE state.");
/*<
* Move dcb to linked list of victim dcbs.
* Move zombie dcb to linked list of victim dcbs.
* The variable dcb is used to hold the last DCB
* to have been added to the linked list, or NULL
* if none has yet been added. If the list
* (listofdcb) is not NULL, then it follows that
* dcb will also not be null.
*/
if (listofdcb == NULL) {
if (listofdcb == NULL)
{
listofdcb = zombiedcb;
dcb = listofdcb;
} else {
}
else
{
dcb->memdata.next = zombiedcb;
dcb = dcb->memdata.next;
}
dcb->memdata.next = NULL;
/* Set dcb for next iteration of loop */
dcb = zombiedcb;
zombiedcb = zombiedcb->memdata.next;
/* After we've moved zombiedcb forward, set
link to null as dcb is last of the new list */
dcb->memdata.next = NULL;
}
else
{
/* Since we didn't remove this dcb from the zombies
list, we need to advance the previous pointer */
previousdcb = zombiedcb;
zombiedcb = zombiedcb->memdata.next;
}