mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: buffer: replace buffer_not_empty() with b_data() or c_data()

Browse Source 
It's mostly for consistency as many places already use one of these instead.
This commit is contained in:
Willy Tarreau 2018-07-10 09:50:25 +02:00
parent eac5259888
commit d760eecf61
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/common/buffer.h
View File

@ -61,16 +61,10 @@ void buffer_dump(FILE *o, struct buffer *b, int from, int to);
/***** FIXME: OLD API BELOW *****/ /***** FIXME: OLD API BELOW *****/
/* Return non-zero only if the buffer is not empty */
static inline int buffer_not_empty(const struct buffer *buf)
{
return buf->i | buf->o;
}
/* Return non-zero only if the buffer is empty */ /* Return non-zero only if the buffer is empty */
static inline int buffer_empty(const struct buffer *buf) static inline int buffer_empty(const struct buffer *buf)
{ {
return !buffer_not_empty(buf); return !b_data(buf);
} }
/* Returns non-zero if the buffer's INPUT is considered full, which means that /* Returns non-zero if the buffer's INPUT is considered full, which means that

4
src/buffer.c
View File

@ -89,7 +89,7 @@ int buffer_replace2(struct buffer *b, char *pos, char *end, const char *str, int
if (b_tail(b) + delta > b->data + b->size) if (b_tail(b) + delta > b->data + b->size)
return 0; /* no space left */ return 0; /* no space left */
if (buffer_not_empty(b) && if (b_data(b) &&
b_tail(b) + delta > b_head(b) && b_tail(b) + delta > b_head(b) &&
b_head(b) >= b_tail(b)) b_head(b) >= b_tail(b))
return 0; /* no space left before wrapping data */ return 0; /* no space left before wrapping data */
@ -128,7 +128,7 @@ int buffer_insert_line2(struct buffer *b, char *pos, const char *str, int len)
if (b_tail(b) + delta >= b->data + b->size) if (b_tail(b) + delta >= b->data + b->size)
return 0; /* no space left */ return 0; /* no space left */
if (buffer_not_empty(b) && if (b_data(b) &&
b_tail(b) + delta > b_head(b) && b_tail(b) + delta > b_head(b) &&
b_head(b) >= b_tail(b)) b_head(b) >= b_tail(b))
return 0; /* no space left before wrapping data */ return 0; /* no space left before wrapping data */

12
src/proto_http.c
View File

@ -1631,7 +1631,7 @@ int http_wait_for_request(struct stream *s, struct channel *req, int an_bit)
s->srv_error = http_return_srv_error; s->srv_error = http_return_srv_error;
/* If there is data available for analysis, log the end of the idle time. */ /* If there is data available for analysis, log the end of the idle time. */
if (buffer_not_empty(req->buf) && s->logs.t_idle == -1) if (c_data(req) && s->logs.t_idle == -1)
s->logs.t_idle = tv_ms_elapsed(&s->logs.tv_accept, &now) - s->logs.t_handshake; s->logs.t_idle = tv_ms_elapsed(&s->logs.tv_accept, &now) - s->logs.t_handshake;
/* There's a protected area at the end of the buffer for rewriting /* There's a protected area at the end of the buffer for rewriting
@ -1639,7 +1639,7 @@ int http_wait_for_request(struct stream *s, struct channel *req, int an_bit)
* protected area is affected, because we may have to move processed * protected area is affected, because we may have to move processed
* data later, which is much more complicated. * data later, which is much more complicated.
*/ */
if (buffer_not_empty(req->buf) && msg->msg_state < HTTP_MSG_ERROR) { if (c_data(req) && msg->msg_state < HTTP_MSG_ERROR) {
if (txn->flags & TX_NOT_FIRST) { if (txn->flags & TX_NOT_FIRST) {
if (unlikely(!channel_is_rewritable(req))) { if (unlikely(!channel_is_rewritable(req))) {
if (req->flags & (CF_SHUTW|CF_SHUTW_NOW|CF_WRITE_ERROR|CF_WRITE_TIMEOUT)) if (req->flags & (CF_SHUTW|CF_SHUTW_NOW|CF_WRITE_ERROR|CF_WRITE_TIMEOUT))
@ -4142,7 +4142,7 @@ int http_wait_for_request_body(struct stream *s, struct channel *req, int an_bit
* TRAILERS state. * TRAILERS state.
*/ */
unsigned int chunk; unsigned int chunk;
int ret = h1_parse_chunk_size(req->buf, co_data(req) + msg->next, b_data(req->buf), &chunk); int ret = h1_parse_chunk_size(req->buf, co_data(req) + msg->next, c_data(req), &chunk);
if (!ret) if (!ret)
goto missing_data; goto missing_data;
@ -5126,7 +5126,7 @@ int http_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
* protected area is affected, because we may have to move processed * protected area is affected, because we may have to move processed
* data later, which is much more complicated. * data later, which is much more complicated.
*/ */
if (buffer_not_empty(rep->buf) && msg->msg_state < HTTP_MSG_ERROR) { if (c_data(rep) && msg->msg_state < HTTP_MSG_ERROR) {
if (unlikely(!channel_is_rewritable(rep))) { if (unlikely(!channel_is_rewritable(rep))) {
/* some data has still not left the buffer, wake us once that's done */ /* some data has still not left the buffer, wake us once that's done */
if (rep->flags & (CF_SHUTW|CF_SHUTW_NOW|CF_WRITE_ERROR|CF_WRITE_TIMEOUT)) if (rep->flags & (CF_SHUTW|CF_SHUTW_NOW|CF_WRITE_ERROR|CF_WRITE_TIMEOUT))
@ -6353,7 +6353,7 @@ http_msg_forward_chunked_body(struct stream *s, struct http_msg *msg)
case HTTP_MSG_CHUNK_CRLF: case HTTP_MSG_CHUNK_CRLF:
/* we want the CRLF after the data */ /* we want the CRLF after the data */
ret = h1_skip_chunk_crlf(chn->buf, co_data(chn) + msg->next, b_data(chn->buf)); ret = h1_skip_chunk_crlf(chn->buf, co_data(chn) + msg->next, c_data(chn));
if (ret == 0) if (ret == 0)
goto missing_data_or_waiting; goto missing_data_or_waiting;
if (ret < 0) { if (ret < 0) {
@ -6371,7 +6371,7 @@ http_msg_forward_chunked_body(struct stream *s, struct http_msg *msg)
* then set ->next to point to the body and switch to * then set ->next to point to the body and switch to
* DATA or TRAILERS state. * DATA or TRAILERS state.
*/ */
ret = h1_parse_chunk_size(chn->buf, co_data(chn) + msg->next, b_data(chn->buf), &chunk); ret = h1_parse_chunk_size(chn->buf, co_data(chn) + msg->next, c_data(chn), &chunk);
if (ret == 0) if (ret == 0)
goto missing_data_or_waiting; goto missing_data_or_waiting;
if (ret < 0) { if (ret < 0) {

2
src/stream_interface.c
View File

@ -1115,7 +1115,7 @@ static void si_cs_recv_cb(struct conn_stream *cs)
if (conn->xprt->rcv_pipe && conn->mux->rcv_pipe && if (conn->xprt->rcv_pipe && conn->mux->rcv_pipe &&
(ic->pipe || ic->to_forward >= MIN_SPLICE_FORWARD) && (ic->pipe || ic->to_forward >= MIN_SPLICE_FORWARD) &&
ic->flags & CF_KERN_SPLICING) { ic->flags & CF_KERN_SPLICING) {
if (buffer_not_empty(ic->buf)) { if (c_data(ic)) {
/* We're embarrassed, there are already data pending in /* We're embarrassed, there are already data pending in
* the buffer and we don't want to have them at two * the buffer and we don't want to have them at two
* locations at a time. Let's indicate we need some * locations at a time. Let's indicate we need some