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

poll.c : forgot from previous commit

Browse Source 
debugcmd.c : cannot compile.
This commit is contained in:
vraatikka 2013-09-17 00:16:06 +03:00
parent 8bf73ea154
commit 5fba84a4ee
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
server/core/poll.c
View File

@ -244,7 +244,21 @@ poll_waitevents(void *arg)
__uint32_t ev = events[i].events;
CHK_DCB(dcb);
#if defined(SS_DEBUG)
if (dcb_fake_write_ev[dcb->fd] != 0) {
skygw_log_write(
LOGFILE_TRACE,
"%lu %d [poll_waitevents] "
"Added fake events %d to ev %d.",
pthread_self(),
thread_id,
dcb_fake_write_ev[dcb->fd],
ev);
ev |= dcb_fake_write_ev[dcb->fd];
dcb_fake_write_ev[dcb->fd] = 0;
}
#endif
ss_debug(spinlock_acquire(&dcb->dcb_initlock);)
ss_dassert(dcb->state != DCB_STATE_ALLOC);
ss_dassert(dcb->state != DCB_STATE_DISCONNECTED);
@ -261,8 +275,33 @@ poll_waitevents(void *arg)
if (ev & EPOLLERR)
{
atomic_add(&pollStats.n_error, 1);
dcb->func.error(dcb);
int eno = gw_getsockerrno(dcb->fd);
#if defined(SS_DEBUG)
if (eno == 0) {
eno = dcb_fake_write_errno[dcb->fd];
skygw_log_write(
LOGFILE_TRACE,
"%lu %d [poll_waitevents] "
"Added fake errno %d. %s",
pthread_self(),
thread_id,
eno,
strerror(eno));
}
dcb_fake_write_errno[dcb->fd] = 0;
#endif
if (eno != 0) {
skygw_log_write(
LOGFILE_TRACE,
"%lu %d [poll_waitevents] "
"EPOLLERR due %d, %s.",
pthread_self(),
thread_id,
eno,
strerror(eno));
}
atomic_add(&pollStats.n_error, 1);
dcb->func.error(dcb);
if (DCB_ISZOMBIE(dcb)) {
continue;
}

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

@ -206,6 +206,8 @@ struct subcommand disableoptions[] = {
{0, 0, 0} }
};
#if defined(SS_DEBUG)
static void fail_backendfd(void);
static void fail_clientfd(void);
@ -235,7 +237,7 @@ struct subcommand failoptions[] = {
{0, 0, 0}
}
};
#endif /* SS_DEBUG */
static void telnetdAddUser(DCB *, char *, char *);
/**
@ -284,7 +286,9 @@ static struct {
{ "reload", reloadoptions },
{ "enable", enableoptions },
{ "disable", disableoptions },
#if defined(SS_DEBUG)
{ "fail", failoptions },
#endif
{ NULL, NULL }
};
@ -728,6 +732,7 @@ static void disable_log_action(DCB *dcb, char *arg1) {
skygw_log_disable(type);
}
#if defined(SS_DEBUG)
static void fail_backendfd(void)
{
fail_next_backend_fd = TRUE;
@ -737,3 +742,4 @@ static void fail_clientfd(void)
{
fail_next_client_fd = TRUE;
}
#endif