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

Remove unused DCB state

Browse Source 
The state was never assigned.
This commit is contained in:
Markus Mäkelä
2018-07-17 20:08:53 +03:00
parent d9fde54b95
commit d91710c640
3 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/maxscale/dcb.h
View File

@ -60,7 +60,6 @@ typedef enum
DCB_STATE_UNDEFINED, /*< State variable with no state */ DCB_STATE_UNDEFINED, /*< State variable with no state */
DCB_STATE_ALLOC, /*< Memory allocated but not populated */ DCB_STATE_ALLOC, /*< Memory allocated but not populated */
DCB_STATE_POLLING, /*< Waiting in the poll loop */ DCB_STATE_POLLING, /*< Waiting in the poll loop */
DCB_STATE_WAITING, /*< Client wanting a connection */
DCB_STATE_LISTENING, /*< The DCB is for a listening socket */ DCB_STATE_LISTENING, /*< The DCB is for a listening socket */
DCB_STATE_DISCONNECTED, /*< The socket is now closed */ DCB_STATE_DISCONNECTED, /*< The socket is now closed */
DCB_STATE_NOPOLLING, /*< Removed from poll mask */ DCB_STATE_NOPOLLING, /*< Removed from poll mask */

2
server/core/dcb.cc
View File

@ -3083,7 +3083,7 @@ static uint32_t dcb_process_poll_events(DCB *dcb, uint32_t events)
} }
if ((events & EPOLLIN) && (dcb->n_close == 0)) if ((events & EPOLLIN) && (dcb->n_close == 0))
{ {
if (dcb->state == DCB_STATE_LISTENING || dcb->state == DCB_STATE_WAITING) if (dcb->state == DCB_STATE_LISTENING)
{ {
MXS_DEBUG("%lu [poll_waitevents] " MXS_DEBUG("%lu [poll_waitevents] "
"Accept in fd %d", "Accept in fd %d",

15
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -1392,17 +1392,10 @@ int gw_MySQLAccept(DCB *listener)
CHK_DCB(listener); CHK_DCB(listener);
if (DCB_STATE_WAITING == listener->state)
{
gw_process_one_new_client(listener);
}
else
{
while ((client_dcb = dcb_accept(listener)) != NULL) while ((client_dcb = dcb_accept(listener)) != NULL)
{ {
gw_process_one_new_client(client_dcb); gw_process_one_new_client(client_dcb);
} /**< while client_dcb != NULL */ } /**< while client_dcb != NULL */
}
/* Must have broken out of while loop or received NULL client_dcb */ /* Must have broken out of while loop or received NULL client_dcb */
return 1; return 1;
@ -1424,14 +1417,8 @@ static void gw_process_one_new_client(DCB *client_dcb)
} }
CHK_PROTOCOL(protocol); CHK_PROTOCOL(protocol);
client_dcb->protocol = protocol; client_dcb->protocol = protocol;
if (DCB_STATE_WAITING == client_dcb->state)
{
client_dcb->state = DCB_STATE_ALLOC;
}
else
{
atomic_add(&client_dcb->service->client_count, 1); atomic_add(&client_dcb->service->client_count, 1);
}
//send handshake to the client_dcb //send handshake to the client_dcb
MySQLSendHandshake(client_dcb); MySQLSendHandshake(client_dcb);