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

Enabled set and clear the flag BREF_WAITING_RESULT. It is actually a counter which is modified with atomic operations only. Setting and clearing BREF_WAITING_RESULT also includes atomic increment and decrement of corresponding backend server's current operations counter, backend_server->stats.n_current_ops.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-06-30 11:00:04 +03:00
parent fcf67716fd
commit 862d504a74
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -1422,7 +1422,8 @@ static void clientReply (
{ {
/** Write reply to client DCB */ /** Write reply to client DCB */
SESSION_ROUTE_REPLY(backend_dcb->session, writebuf); SESSION_ROUTE_REPLY(backend_dcb->session, writebuf);
#if 0 #if 1
/** Set response status as replied */
bref_clear_state(bref, BREF_WAITING_RESULT); bref_clear_state(bref, BREF_WAITING_RESULT);
#endif #endif
} }
@ -1512,8 +1513,11 @@ static void bref_clear_state(
int prev1; int prev1;
int prev2; int prev2;
/** Decrease waiter count */
prev1 = atomic_add(&bref->bref_num_result_wait, -1); prev1 = atomic_add(&bref->bref_num_result_wait, -1);
ss_dassert(prev1 >= 0); ss_dassert(prev1 >= 0);
/** Decrease global operation count */
prev2 = atomic_add( prev2 = atomic_add(
&bref->bref_backend->backend_server->stats.n_current_ops, -1); &bref->bref_backend->backend_server->stats.n_current_ops, -1);
ss_dassert(prev2 >= 0); ss_dassert(prev2 >= 0);
@ -1541,8 +1545,11 @@ static void bref_set_state(
int prev1; int prev1;
int prev2; int prev2;
/** Increase waiter count */
prev1 = atomic_add(&bref->bref_num_result_wait, 1); prev1 = atomic_add(&bref->bref_num_result_wait, 1);
ss_dassert(prev1 >= 0); ss_dassert(prev1 >= 0);
/** Increase global operation count */
prev2 = atomic_add( prev2 = atomic_add(
&bref->bref_backend->backend_server->stats.n_current_ops, 1); &bref->bref_backend->backend_server->stats.n_current_ops, 1);
ss_dassert(prev2 >= 0); ss_dassert(prev2 >= 0);
@ -2283,7 +2290,8 @@ static GWBUF* sescmd_cursor_process_replies(
/** discard packet */ /** discard packet */
replybuf = gwbuf_consume(replybuf, buflen); replybuf = gwbuf_consume(replybuf, buflen);
} }
#if 0 #if 1
/** Set response status received */
bref_clear_state(bref, BREF_WAITING_RESULT); bref_clear_state(bref, BREF_WAITING_RESULT);
#endif #endif
} }
@ -3046,7 +3054,7 @@ static bool handle_error_new_connection(
DCB* client_dcb; DCB* client_dcb;
client_dcb = ses->client; client_dcb = ses->client;
client_dcb->func.write(client_dcb, errmsg); client_dcb->func.write(client_dcb, errmsg);
#if 0 #if 1
bref_clear_state(bref, BREF_WAITING_RESULT); bref_clear_state(bref, BREF_WAITING_RESULT);
#endif #endif
} }