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

Bug 515 Conditional arguemnt to gw_write

Browse Source
This commit is contained in:
Mark Riddoch
2014-11-19 16:43:21 +00:00
parent 0e6fa09d7e
commit 43ed77b52b
3 changed files with 14 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/core/dcb.c
View File

@ -954,11 +954,7 @@ int below_water;
#endif /* FAKE_CODE */ #endif /* FAKE_CODE */
qlen = GWBUF_LENGTH(queue); qlen = GWBUF_LENGTH(queue);
GW_NOINTR_CALL( GW_NOINTR_CALL(
w = gw_write( w = gw_write(dcb, GWBUF_DATA(queue), qlen);
#if defined(SS_DEBUG)
dcb,
#endif
dcb->fd, GWBUF_DATA(queue), qlen);
dcb->stats.n_writes++; dcb->stats.n_writes++;
); );
@ -1110,13 +1106,7 @@ int above_water;
while (dcb->writeq != NULL) while (dcb->writeq != NULL)
{ {
len = GWBUF_LENGTH(dcb->writeq); len = GWBUF_LENGTH(dcb->writeq);
GW_NOINTR_CALL(w = gw_write( GW_NOINTR_CALL(w = gw_write(dcb, GWBUF_DATA(dcb->writeq), len););
#if defined(SS_DEBUG)
dcb,
#endif
dcb->fd,
GWBUF_DATA(dcb->writeq),
len););
saved_errno = errno; saved_errno = errno;
errno = 0; errno = 0;
@ -1759,15 +1749,18 @@ static bool dcb_set_state_nomutex(
return succp; return succp;
} }
int gw_write( /**
#if defined(SS_DEBUG) * Write data to a DCB
DCB* dcb, *
#endif * @param dcb The DCB to write buffer
int fd, * @param buf Buffer to write
const void* buf, * @param nbytes Number of bytes to write
size_t nbytes) */
int
gw_write(DCB *dcb, const void *buf, size_t nbytes)
{ {
int w; int w;
int fd = dcb->fd;
#if defined(FAKE_CODE) #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);

8
server/include/dcb.h
View File

@ -290,13 +290,7 @@ int fail_accept_errno;
#define DCB_POLL_BUSY(x) ((x)->evq.next != NULL) #define DCB_POLL_BUSY(x) ((x)->evq.next != NULL)
DCB *dcb_get_zombies(void); DCB *dcb_get_zombies(void);
int gw_write( int gw_write(DCB *, const void *, size_t);
#if defined(SS_DEBUG)
DCB* dcb,
#endif
int fd,
const void* buf,
size_t nbytes);
int dcb_write(DCB *, GWBUF *); int dcb_write(DCB *, GWBUF *);
DCB *dcb_alloc(dcb_role_t); DCB *dcb_alloc(dcb_role_t);
void dcb_free(DCB *); void dcb_free(DCB *);

8
server/include/gw.h
View File

@ -61,13 +61,7 @@ int do_read_dcb(DCB *dcb);
int do_read_10(DCB *dcb, uint8_t *buffer); int do_read_10(DCB *dcb, uint8_t *buffer);
int MySQLWrite(DCB *dcb, GWBUF *queue); int MySQLWrite(DCB *dcb, GWBUF *queue);
int setnonblocking(int fd); int setnonblocking(int fd);
int gw_write( int gw_write(DCB *dcb, const void *buf, size_t nbytes);
#if defined(SS_DEBUG)
DCB* dcb,
#endif
int fd,
const void* buf,
size_t nbytes);
int gw_getsockerrno(int fd); int gw_getsockerrno(int fd);
int parse_bindconfig(char *, unsigned short, struct sockaddr_in *); int parse_bindconfig(char *, unsigned short, struct sockaddr_in *);
int setipaddress(struct in_addr *, char *); int setipaddress(struct in_addr *, char *);