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

Put errors ganerating code behind FAKE_CODE macro, which is not defined by default in any build.

Browse Source
This commit is contained in:
VilhoRaatikka
2014-11-10 15:22:08 +02:00
parent 7f7cb0a982
commit 9a5168c3e8
6 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/dcb.c
View File

@ -862,7 +862,7 @@ int below_water;
while (queue != NULL) while (queue != NULL)
{ {
int qlen; int qlen;
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
if (dcb->dcb_role == DCB_ROLE_REQUEST_HANDLER && if (dcb->dcb_role == DCB_ROLE_REQUEST_HANDLER &&
dcb->session != NULL) dcb->session != NULL)
{ {
@ -878,7 +878,7 @@ int below_water;
fail_next_backend_fd = false; fail_next_backend_fd = false;
} }
} }
#endif /* SS_DEBUG */ #endif /* FAKE_CODE */
qlen = GWBUF_LENGTH(queue); qlen = GWBUF_LENGTH(queue);
GW_NOINTR_CALL( GW_NOINTR_CALL(
w = gw_write( w = gw_write(
@ -1684,7 +1684,7 @@ int gw_write(
size_t nbytes) size_t nbytes)
{ {
int w; int w;
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
if (dcb_fake_write_errno[fd] != 0) { if (dcb_fake_write_errno[fd] != 0) {
ss_dassert(dcb_fake_write_ev[fd] != 0); ss_dassert(dcb_fake_write_ev[fd] != 0);
w = write(fd, buf, nbytes/2); /*< leave peer to read missing bytes */ w = write(fd, buf, nbytes/2); /*< leave peer to read missing bytes */
@ -1698,7 +1698,7 @@ int gw_write(
} }
#else #else
w = write(fd, buf, nbytes); w = write(fd, buf, nbytes);
#endif /* SS_DEBUG && SS_TEST */ #endif /* FAKE_CODE */
#if defined(SS_DEBUG_MYSQL) #if defined(SS_DEBUG_MYSQL)
{ {

4
server/core/gateway.c
View File

@ -1025,7 +1025,7 @@ int main(int argc, char **argv)
progname = *argv; progname = *argv;
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
memset(conn_open, 0, sizeof(bool)*10240); memset(conn_open, 0, sizeof(bool)*10240);
memset(dcb_fake_write_errno, 0, sizeof(unsigned char)*10240); memset(dcb_fake_write_errno, 0, sizeof(unsigned char)*10240);
memset(dcb_fake_write_ev, 0, sizeof(__int32_t)*10240); memset(dcb_fake_write_ev, 0, sizeof(__int32_t)*10240);
@ -1033,7 +1033,7 @@ int main(int argc, char **argv)
fail_next_client_fd = false; fail_next_client_fd = false;
fail_next_accept = 0; fail_next_accept = 0;
fail_accept_errno = 0; fail_accept_errno = 0;
#endif #endif /* FAKE_CODE */
file_write_header(stderr); file_write_header(stderr);
/*< /*<
* Register functions which are called at exit except libmysqld-related, * Register functions which are called at exit except libmysqld-related,

8
server/core/poll.c
View File

@ -625,7 +625,7 @@ uint32_t ev;
thread_data[thread_id].event = ev; thread_data[thread_id].event = ev;
} }
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
if (dcb_fake_write_ev[dcb->fd] != 0) { if (dcb_fake_write_ev[dcb->fd] != 0) {
LOGIF(LD, (skygw_log_write( LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG, LOGFILE_DEBUG,
@ -637,7 +637,7 @@ uint32_t ev;
ev |= dcb_fake_write_ev[dcb->fd]; ev |= dcb_fake_write_ev[dcb->fd];
dcb_fake_write_ev[dcb->fd] = 0; dcb_fake_write_ev[dcb->fd] = 0;
} }
#endif #endif /* FAKE_CODE */
ss_debug(spinlock_acquire(&dcb->dcb_initlock);) ss_debug(spinlock_acquire(&dcb->dcb_initlock);)
ss_dassert(dcb->state != DCB_STATE_ALLOC); ss_dassert(dcb->state != DCB_STATE_ALLOC);
ss_dassert(dcb->state != DCB_STATE_DISCONNECTED); ss_dassert(dcb->state != DCB_STATE_DISCONNECTED);
@ -735,7 +735,7 @@ uint32_t ev;
if (ev & EPOLLERR) if (ev & EPOLLERR)
{ {
int eno = gw_getsockerrno(dcb->fd); int eno = gw_getsockerrno(dcb->fd);
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
if (eno == 0) { if (eno == 0) {
eno = dcb_fake_write_errno[dcb->fd]; eno = dcb_fake_write_errno[dcb->fd];
LOGIF(LD, (skygw_log_write( LOGIF(LD, (skygw_log_write(
@ -748,7 +748,7 @@ uint32_t ev;
strerror(eno)))); strerror(eno))));
} }
dcb_fake_write_errno[dcb->fd] = 0; dcb_fake_write_errno[dcb->fd] = 0;
#endif #endif /* FAKE_CODE */
if (eno != 0) { if (eno != 0) {
LOGIF(LD, (skygw_log_write( LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG, LOGFILE_DEBUG,

4
server/include/dcb.h
View File

@ -252,14 +252,14 @@ typedef struct dcb {
#endif #endif
} DCB; } DCB;
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
unsigned char dcb_fake_write_errno[10240]; unsigned char dcb_fake_write_errno[10240];
__int32_t dcb_fake_write_ev[10240]; __int32_t dcb_fake_write_ev[10240];
bool fail_next_backend_fd; bool fail_next_backend_fd;
bool fail_next_client_fd; bool fail_next_client_fd;
int fail_next_accept; int fail_next_accept;
int fail_accept_errno; int fail_accept_errno;
#endif #endif /* FAKE_CODE */
/* A few useful macros */ /* A few useful macros */
#define DCB_SESSION(x) (x)->session #define DCB_SESSION(x) (x)->session

11
server/modules/protocol/mysql_client.c
View File

@ -836,9 +836,6 @@ int gw_read_client_event(
} }
else else
{ {
GWBUF* errbuf;
bool succp;
modutil_send_mysql_err_packet(dcb, modutil_send_mysql_err_packet(dcb,
1, 1,
0, 0,
@ -1108,7 +1105,7 @@ int gw_MySQLAccept(DCB *listener)
retry_accept: retry_accept:
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
if (fail_next_accept > 0) if (fail_next_accept > 0)
{ {
c_sock = -1; c_sock = -1;
@ -1116,16 +1113,16 @@ int gw_MySQLAccept(DCB *listener)
fail_next_accept -= 1; fail_next_accept -= 1;
} else { } else {
fail_accept_errno = 0; fail_accept_errno = 0;
#endif /* SS_DEBUG */ #endif /* FAKE_CODE */
// new connection from client // new connection from client
c_sock = accept(listener->fd, c_sock = accept(listener->fd,
(struct sockaddr *) &client_conn, (struct sockaddr *) &client_conn,
&client_len); &client_len);
eno = errno; eno = errno;
errno = 0; errno = 0;
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
} }
#endif /* SS_DEBUG */ #endif /* FAKE_CODE */
if (c_sock == -1) { if (c_sock == -1) {

12
server/modules/routing/debugcmd.c
View File

@ -414,7 +414,7 @@ struct subcommand disableoptions[] = {
} }
}; };
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
static void fail_backendfd(void); static void fail_backendfd(void);
static void fail_clientfd(void); static void fail_clientfd(void);
@ -456,7 +456,7 @@ struct subcommand failoptions[] = {
{0, 0, 0} {0, 0, 0}
} }
}; };
#endif /* SS_DEBUG */ #endif /* FAKE_CODE */
static void telnetdAddUser(DCB *, char *, char *); static void telnetdAddUser(DCB *, char *, char *);
/** /**
@ -502,9 +502,9 @@ static struct {
{ "clear", clearoptions }, { "clear", clearoptions },
{ "disable", disableoptions }, { "disable", disableoptions },
{ "enable", enableoptions }, { "enable", enableoptions },
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
{ "fail", failoptions }, { "fail", failoptions },
#endif #endif /* FAKE_CODE */
{ "list", listoptions }, { "list", listoptions },
{ "reload", reloadoptions }, { "reload", reloadoptions },
{ "remove", removeoptions }, { "remove", removeoptions },
@ -1113,7 +1113,7 @@ static void disable_log_action(DCB *dcb, char *arg1) {
skygw_log_disable(type); skygw_log_disable(type);
} }
#if defined(SS_DEBUG) #if defined(FAKE_CODE)
static void fail_backendfd(void) static void fail_backendfd(void)
{ {
fail_next_backend_fd = true; fail_next_backend_fd = true;
@ -1157,4 +1157,4 @@ static void fail_accept(
return ; return ;
} }
} }
#endif #endif /* FAKE_CODE */