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

Iterate using the correct list

Browse Source 
The `thread.next` pointer refers to active DCBs in the current thread's
list and the `memdata.next` pointer refers to DCBs about to be freed. The
latter was mixed up with the former due to some changes in the naming.
This commit is contained in:
Markus Makela
2016-11-25 11:01:03 +02:00
parent 5411180a50
commit 32b0f6a607
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/dcb.c
View File

@ -1953,7 +1953,7 @@ dprintAllDCBs(DCB *pdcb)
{ {
spinlock_acquire(&all_dcbs_lock[i]); spinlock_acquire(&all_dcbs_lock[i]);
for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->memdata.next) for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->thread.next)
{ {
dprintOneDCB(pdcb, dcb); dprintOneDCB(pdcb, dcb);
} }
@ -1981,7 +1981,7 @@ dListDCBs(DCB *pdcb)
for (int i = 0; i < nthr; i++) for (int i = 0; i < nthr; i++)
{ {
spinlock_acquire(&all_dcbs_lock[i]); spinlock_acquire(&all_dcbs_lock[i]);
for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->memdata.next) for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->thread.next)
{ {
dcb_printf(pdcb, " %-16p | %-26s | %-18s | %s\n", dcb_printf(pdcb, " %-16p | %-26s | %-18s | %s\n",
dcb, gw_dcb_state2string(dcb->state), dcb, gw_dcb_state2string(dcb->state),
@ -2014,7 +2014,7 @@ dListClients(DCB *pdcb)
for (int i = 0; i < nthr; i++) for (int i = 0; i < nthr; i++)
{ {
spinlock_acquire(&all_dcbs_lock[i]); spinlock_acquire(&all_dcbs_lock[i]);
for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->memdata.next) for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->thread.next)
{ {
if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER) if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER)
{ {
@ -2521,7 +2521,7 @@ dcb_hangup_foreach(struct server* server)
{ {
spinlock_acquire(&all_dcbs_lock[i]); spinlock_acquire(&all_dcbs_lock[i]);
for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->memdata.next) for (DCB *dcb = all_dcbs[i]; dcb; dcb = dcb->thread.next)
{ {
spinlock_acquire(&dcb->dcb_initlock); spinlock_acquire(&dcb->dcb_initlock);
if (dcb->state == DCB_STATE_POLLING && dcb->server && if (dcb->state == DCB_STATE_POLLING && dcb->server &&
@ -3498,7 +3498,7 @@ void dcb_process_idle_sessions(int thr)
* check for it once per second. One heartbeat is 100 milliseconds. */ * check for it once per second. One heartbeat is 100 milliseconds. */
next_timeout_check = hkheartbeat + 10; next_timeout_check = hkheartbeat + 10;
for (DCB *dcb = all_dcbs[thr]; dcb; dcb = dcb->memdata.next) for (DCB *dcb = all_dcbs[thr]; dcb; dcb = dcb->thread.next)
{ {
if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER) if (dcb->dcb_role == DCB_ROLE_CLIENT_HANDLER)
{ {
@ -3524,7 +3524,7 @@ bool dcb_foreach(bool(*func)(DCB *, void *), void *data)
{ {
spinlock_acquire(&all_dcbs_lock[i]); spinlock_acquire(&all_dcbs_lock[i]);
for (DCB *dcb = all_dcbs[i]; dcb && more; dcb = dcb->memdata.next) for (DCB *dcb = all_dcbs[i]; dcb && more; dcb = dcb->thread.next)
{ {
if (!func(dcb, data)) if (!func(dcb, data))
{ {