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

Modified dcb_call_foreach so that it doesn't hold spinlock (dcbspin) continuously because it caused deadlock when new slaves were tried to connect with.

Browse Source 
Fixed a few smallish things.
This commit is contained in:
VilhoRaatikka
2014-06-13 14:52:04 +03:00
parent dfc9141a38
commit 09d20d1059
3 changed files with 94 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
server/core/dcb.c
View File

@ -83,6 +83,7 @@ static bool dcb_set_state_nomutex(
const dcb_state_t new_state,
dcb_state_t* old_state);
static void dcb_call_callback(DCB *dcb, DCB_REASON reason);
static DCB* dcb_get_next (DCB* dcb);
DCB* dcb_get_zombies(void)
{
@ -1728,6 +1729,41 @@ int rval = 0;
return rval;
}
static DCB* dcb_get_next (
DCB* dcb)
{
DCB* p;
spinlock_acquire(&dcbspin);
p = allDCBs;
if (dcb == NULL || p == NULL)
{
dcb = p;
}
else
{
while (p != NULL && dcb != p)
{
p = p->next;
}
if (p != NULL)
{
dcb = p->next;
}
else
{
dcb = NULL;
}
}
spinlock_release(&dcbspin);
return dcb;
}
void dcb_call_foreach (
SERVER* srv,
DCB_REASON reason)
@ -1742,16 +1778,16 @@ void dcb_call_foreach (
case DCB_REASON_NOT_RESPONDING:
{
DCB* dcb;
dcb = dcb_get_next(NULL);
spinlock_acquire(&dcbspin);
dcb = allDCBs;
while (dcb)
while (dcb != NULL)
{
dcb_call_callback(dcb, DCB_REASON_NOT_RESPONDING);
dcb = dcb->next;
if (dcb->state == DCB_STATE_POLLING)
{
dcb_call_callback(dcb, DCB_REASON_NOT_RESPONDING);
}
dcb = dcb_get_next(dcb);
}
spinlock_release(&dcbspin);
break;
}