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

Merge branch 'develop' into feature-MX-60

Browse Source
This commit is contained in:
MassimilianoPinto
2014-05-28 14:48:27 +02:00
parent 77b790efbf 89c51cff20
commit ca4b53f1b8
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/buffer.c
View File

@ -284,7 +284,11 @@ unsigned int
gwbuf_length(GWBUF *head) gwbuf_length(GWBUF *head)
{ {
int rval = 0; int rval = 0;
CHK_GWBUF(head);
if (head)
{
CHK_GWBUF(head);
}
while (head) while (head)
{ {
rval += GWBUF_LENGTH(head); rval += GWBUF_LENGTH(head);

22
server/core/dcb.c
View File

@ -759,7 +759,10 @@ int below_water;
* the routine that drains the queue data, so we should * the routine that drains the queue data, so we should
* not have a race condition on the event. * not have a race condition on the event.
*/ */
qlen = gwbuf_length(queue); if (queue)
qlen = gwbuf_length(queue);
else
qlen = 0;
atomic_add(&dcb->writeqlen, qlen); atomic_add(&dcb->writeqlen, qlen);
dcb->writeq = gwbuf_append(dcb->writeq, queue); dcb->writeq = gwbuf_append(dcb->writeq, queue);
dcb->stats.n_buffered++; dcb->stats.n_buffered++;
@ -873,7 +876,14 @@ int below_water;
* for suspended write. * for suspended write.
*/ */
dcb->writeq = queue; dcb->writeq = queue;
qlen = gwbuf_length(queue); if (queue)
{
qlen = gwbuf_length(queue);
}
else
{
qlen = 0;
}
atomic_add(&dcb->writeqlen, qlen); atomic_add(&dcb->writeqlen, qlen);
if (queue != NULL) if (queue != NULL)
@ -1076,7 +1086,8 @@ printDCB(DCB *dcb)
printf("\tDCB state: %s\n", gw_dcb_state2string(dcb->state)); printf("\tDCB state: %s\n", gw_dcb_state2string(dcb->state));
if (dcb->remote) if (dcb->remote)
printf("\tConnected to: %s\n", dcb->remote); printf("\tConnected to: %s\n", dcb->remote);
printf("\tQueued write data: %d\n", gwbuf_length(dcb->writeq)); if (dcb->writeq)
printf("\tQueued write data: %d\n",gwbuf_length(dcb->writeq));
printf("\tStatistics:\n"); printf("\tStatistics:\n");
printf("\t\tNo. of Reads: %d\n", dcb->stats.n_reads); printf("\t\tNo. of Reads: %d\n", dcb->stats.n_reads);
printf("\t\tNo. of Writes: %d\n", dcb->stats.n_writes); printf("\t\tNo. of Writes: %d\n", dcb->stats.n_writes);
@ -1151,7 +1162,8 @@ dprintDCB(DCB *pdcb, DCB *dcb)
if (dcb->remote) if (dcb->remote)
dcb_printf(pdcb, "\tConnected to: %s\n", dcb->remote); dcb_printf(pdcb, "\tConnected to: %s\n", dcb->remote);
dcb_printf(pdcb, "\tOwning Session: %d\n", dcb->session); dcb_printf(pdcb, "\tOwning Session: %d\n", dcb->session);
dcb_printf(pdcb, "\tQueued write data: %d\n", gwbuf_length(dcb->writeq)); if (dcb->writeq)
dcb_printf(pdcb, "\tQueued write data: %d\n", gwbuf_length(dcb->writeq));
dcb_printf(pdcb, "\tStatistics:\n"); dcb_printf(pdcb, "\tStatistics:\n");
dcb_printf(pdcb, "\t\tNo. of Reads: %d\n", dcb->stats.n_reads); dcb_printf(pdcb, "\t\tNo. of Reads: %d\n", dcb->stats.n_reads);
dcb_printf(pdcb, "\t\tNo. of Writes: %d\n", dcb->stats.n_writes); dcb_printf(pdcb, "\t\tNo. of Writes: %d\n", dcb->stats.n_writes);
@ -1553,7 +1565,7 @@ int rval = 1;
/** /**
* Remove a callback from the callback list for the DCB * Remove a callback from the callback list for the DCB
* *
* Searches down the linked list to find he callback with a matching reason, function * Searches down the linked list to find the callback with a matching reason, function
* and userdata. * and userdata.
* *
* @param dcb The DCB to add the callback to * @param dcb The DCB to add the callback to

7
server/modules/protocol/mysql_backend.c
View File

@ -282,7 +282,8 @@ static int gw_read_backend_event(DCB *dcb) {
} /* switch */ } /* switch */
} }
if (backend_protocol->state == MYSQL_AUTH_FAILED) { if (backend_protocol->state == MYSQL_AUTH_FAILED)
{
/** /**
* protocol state won't change anymore, * protocol state won't change anymore,
* lock can be freed * lock can be freed
@ -326,14 +327,14 @@ static int gw_read_backend_event(DCB *dcb) {
if (session->client->session == NULL) if (session->client->session == NULL)
{ {
rc = 1; rc = 1;
goto return_with_lock; goto return_rc;
} }
usleep(1); usleep(1);
} }
if (session->state == SESSION_STATE_STOPPING) if (session->state == SESSION_STATE_STOPPING)
{ {
goto return_with_lock; goto return_rc;
} }
spinlock_acquire(&session->ses_lock); spinlock_acquire(&session->ses_lock);
session->state = SESSION_STATE_STOPPING; session->state = SESSION_STATE_STOPPING;