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

21
server/core/dcb.c
View File

@ -773,11 +773,13 @@ int dcb_read(
if (dcb->fd <= 0) if (dcb->fd <= 0)
{ {
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [dcb_read] Error : Read failed, dcb is %s.", "%lu [dcb_read] Error : Read failed, dcb is %s.",
pthread_self(), pthread_self(),
dcb->fd == DCBFD_CLOSED ? "closed" : "cloned, not readable"))); dcb->fd == DCBFD_CLOSED ? "closed" : "cloned, not readable")));
/* </editor-fold> */
return 0; return 0;
} }
@ -787,6 +789,7 @@ int dcb_read(
if (-1 == ioctl(dcb->fd, FIONREAD, &bytesavailable)) if (-1 == ioctl(dcb->fd, FIONREAD, &bytesavailable))
{ {
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [dcb_read] Error : ioctl FIONREAD for dcb %p in " "%lu [dcb_read] Error : ioctl FIONREAD for dcb %p in "
@ -797,13 +800,14 @@ int dcb_read(
dcb->fd, dcb->fd,
errno, errno,
strerror(errno)))); strerror(errno))));
/* </editor-fold> */
return -1; 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;
@ -823,10 +827,6 @@ int dcb_read(
} }
return 0; return 0;
} }
else if (bytesavailable == 0)
{
return 0;
}
dcb->last_read = hkheartbeat; dcb->last_read = hkheartbeat;
@ -839,6 +839,7 @@ int dcb_read(
* 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.
*/ */
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [dcb_read] Error : Failed to allocate read buffer " "%lu [dcb_read] Error : Failed to allocate read buffer "
@ -848,7 +849,7 @@ int dcb_read(
dcb->fd, dcb->fd,
errno, errno,
strerror(errno)))); strerror(errno))));
/* </editor-fold> */
return -1; return -1;
} }
GW_NOINTR_CALL(nsingleread = read(dcb->fd, GWBUF_DATA(buffer), bufsize); GW_NOINTR_CALL(nsingleread = read(dcb->fd, GWBUF_DATA(buffer), bufsize);
@ -858,6 +859,7 @@ int dcb_read(
{ {
if (errno != 0 && errno != EAGAIN && errno != EWOULDBLOCK) if (errno != 0 && errno != EAGAIN && errno != EWOULDBLOCK)
{ {
/* <editor-fold defaultstate="collapsed" desc=" Error Logging "> */
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [dcb_read] Error : Read failed, dcb %p in state " "%lu [dcb_read] Error : Read failed, dcb %p in state "
@ -868,12 +870,13 @@ int dcb_read(
dcb->fd, dcb->fd,
errno, errno,
strerror(errno)))); strerror(errno))));
/* </editor-fold> */
} }
gwbuf_free(buffer); gwbuf_free(buffer);
return nsingleread; return nsingleread;
} }
nreadtotal += nsingleread; nreadtotal += nsingleread;
/* <editor-fold defaultstate="collapsed" desc=" Debug Logging "> */
LOGIF(LD, (skygw_log_write( LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG, LOGFILE_DEBUG,
"%lu [dcb_read] Read %d bytes from dcb %p in state %s " "%lu [dcb_read] Read %d bytes from dcb %p in state %s "
@ -883,6 +886,7 @@ int dcb_read(
dcb, dcb,
STRDCBSTATE(dcb->state), STRDCBSTATE(dcb->state),
dcb->fd))); dcb->fd)));
/* </editor-fold> */
/*< Append read data to the gwbuf */ /*< Append read data to the gwbuf */
*head = gwbuf_append(*head, buffer); *head = gwbuf_append(*head, buffer);
} /*< while (0 == maxbytes || nreadtotal < maxbytes) */ } /*< while (0 == maxbytes || nreadtotal < maxbytes) */
@ -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
* *