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

Tidy up indentation, add folds around logging, in dcb_read.

Browse Source
This commit is contained in:
counterpoint
2015-07-13 09:56:20 +01:00
parent a9d30b07b3
commit 00b4d8edf5
1 changed files with 115 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
server/core/dcb.c
View File

@ -760,134 +760,138 @@ dcb_connect(SERVER *server, SESSION *session, const char *protocol)
* the last iteration of while loop. 0 is returned if no data available. * the last iteration of while loop. 0 is returned if no data available.
*/ */
int dcb_read( int dcb_read(
DCB *dcb, DCB *dcb,
GWBUF **head, GWBUF **head,
int maxbytes) int maxbytes)
{ {
GWBUF *buffer = NULL; GWBUF *buffer = NULL;
int bytesavailable; int bytesavailable;
int nsingleread = 0; int nsingleread = 0;
int nreadtotal = 0; int nreadtotal = 0;
CHK_DCB(dcb); CHK_DCB(dcb);
if (dcb->fd <= 0) if (dcb->fd <= 0)
{ {
LOGIF(LE, (skygw_log_write_flush( /* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGFILE_ERROR, LOGIF(LE, (skygw_log_write_flush(
"%lu [dcb_read] Error : Read failed, dcb is %s.", LOGFILE_ERROR,
pthread_self(), "%lu [dcb_read] Error : Read failed, dcb is %s.",
dcb->fd == DCBFD_CLOSED ? "closed" : "cloned, not readable"))); pthread_self(),
return 0; dcb->fd == DCBFD_CLOSED ? "closed" : "cloned, not readable")));
} /* </editor-fold> */
return 0;
}
while (0 == maxbytes || nreadtotal < maxbytes) while (0 == maxbytes || nreadtotal < maxbytes)
{
int bufsize;
if (-1 == ioctl(dcb->fd, FIONREAD, &bytesavailable))
{ {
int bufsize; /* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush(
if (-1 == ioctl(dcb->fd, FIONREAD, &bytesavailable)) LOGFILE_ERROR,
{ "%lu [dcb_read] Error : ioctl FIONREAD for dcb %p in "
LOGIF(LE, (skygw_log_write_flush( "state %s fd %d failed due error %d, %s.",
LOGFILE_ERROR, pthread_self(),
"%lu [dcb_read] Error : ioctl FIONREAD for dcb %p in " dcb,
"state %s fd %d failed due error %d, %s.", STRDCBSTATE(dcb->state),
pthread_self(), dcb->fd,
dcb, errno,
STRDCBSTATE(dcb->state), strerror(errno))));
dcb->fd, /* </editor-fold> */
errno, return -1;
strerror(errno)))); }
return -1;
}
if (bytesavailable == 0 && nreadtotal == 0) if (bytesavailable == 0)
{ {
/** Handle closed client socket */ /** Handle closed client socket */
if (dcb_isclient(dcb)) if (nreadtotal == 0 && dcb_isclient(dcb))
{ {
char c; char c;
int l_errno = 0; int l_errno = 0;
int r = -1; int r = -1;
/* try to read 1 byte, without consuming the socket buffer */ /* try to read 1 byte, without consuming the socket buffer */
r = recv(dcb->fd, &c, sizeof(char), MSG_PEEK); r = recv(dcb->fd, &c, sizeof(char), MSG_PEEK);
l_errno = errno; l_errno = errno;
if (r <= 0 && if (r <= 0 &&
l_errno != EAGAIN && l_errno != EAGAIN &&
l_errno != EWOULDBLOCK && l_errno != EWOULDBLOCK &&
l_errno != 0) l_errno != 0)
{
return -1;
}
}
return 0;
}
else if (bytesavailable == 0)
{ {
return 0; return -1;
} }
}
return 0;
}
dcb->last_read = hkheartbeat; dcb->last_read = hkheartbeat;
bufsize = MIN(bytesavailable, MAX_BUFFER_SIZE); bufsize = MIN(bytesavailable, MAX_BUFFER_SIZE);
if (maxbytes) bufsize = MIN(bufsize, maxbytes); if (maxbytes) bufsize = MIN(bufsize, maxbytes);
if ((buffer = gwbuf_alloc(bufsize)) == NULL) if ((buffer = gwbuf_alloc(bufsize)) == NULL)
{ {
/*< /*<
* This is a fatal error which should cause shutdown. * This is a fatal error which should cause shutdown.
* Todo shutdown if memory allocation fails. * Todo shutdown if memory allocation fails.
*/ */
LOGIF(LE, (skygw_log_write_flush( /* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGFILE_ERROR, LOGIF(LE, (skygw_log_write_flush(
"%lu [dcb_read] Error : Failed to allocate read buffer " LOGFILE_ERROR,
"for dcb %p fd %d, due %d, %s.", "%lu [dcb_read] Error : Failed to allocate read buffer "
pthread_self(), "for dcb %p fd %d, due %d, %s.",
dcb, pthread_self(),
dcb->fd, dcb,
errno, dcb->fd,
strerror(errno)))); errno,
strerror(errno))));
return -1; /* </editor-fold> */
} return -1;
GW_NOINTR_CALL(nsingleread = read(dcb->fd, GWBUF_DATA(buffer), bufsize); }
dcb->stats.n_reads++); GW_NOINTR_CALL(nsingleread = read(dcb->fd, GWBUF_DATA(buffer), bufsize);
dcb->stats.n_reads++);
if (nsingleread <= 0) if (nsingleread <= 0)
{ {
if (errno != 0 && errno != EAGAIN && errno != EWOULDBLOCK) if (errno != 0 && errno != EAGAIN && errno != EWOULDBLOCK)
{ {
LOGIF(LE, (skygw_log_write_flush( /* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGFILE_ERROR, LOGIF(LE, (skygw_log_write_flush(
"%lu [dcb_read] Error : Read failed, dcb %p in state " LOGFILE_ERROR,
"%s fd %d, due %d, %s.", "%lu [dcb_read] Error : Read failed, dcb %p in state "
pthread_self(), "%s fd %d, due %d, %s.",
dcb,
STRDCBSTATE(dcb->state),
dcb->fd,
errno,
strerror(errno))));
}
gwbuf_free(buffer);
return nsingleread;
}
nreadtotal += nsingleread;
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [dcb_read] Read %d bytes from dcb %p in state %s "
"fd %d.",
pthread_self(), pthread_self(),
nsingleread,
dcb, dcb,
STRDCBSTATE(dcb->state), STRDCBSTATE(dcb->state),
dcb->fd))); dcb->fd,
/*< Append read data to the gwbuf */ errno,
*head = gwbuf_append(*head, buffer); strerror(errno))));
} /*< while (0 == maxbytes || nreadtotal < maxbytes) */ /* </editor-fold> */
}
gwbuf_free(buffer);
return nsingleread;
}
nreadtotal += nsingleread;
/* <editor-fold defaultstate="collapsed" desc=" Debug Logging "> */
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"%lu [dcb_read] Read %d bytes from dcb %p in state %s "
"fd %d.",
pthread_self(),
nsingleread,
dcb,
STRDCBSTATE(dcb->state),
dcb->fd)));
/* </editor-fold> */
/*< Append read data to the gwbuf */
*head = gwbuf_append(*head, buffer);
} /*< while (0 == maxbytes || nreadtotal < maxbytes) */
return nsingleread; return nsingleread;
} }
/** /**
@ -1101,6 +1105,7 @@ int dcb_read_SSL(
return_n: return_n:
return nread; return nread;
} }
/** /**
* General purpose routine to write to a DCB * General purpose routine to write to a DCB
* *