mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: channel: remove almost all references to buf->i and buf->o

Browse Source 
We use ci_data() and co_data() instead now everywhere we read these
values.
This commit is contained in:
Willy Tarreau 2018-06-15 16:42:02 +02:00
parent acd1403794
commit 3ee8344b7b
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/proto/channel.h
View File

@ -135,7 +135,7 @@ static inline size_t co_data(const struct channel *c)
/* ci_data() : returns the amount of input data in the channel's buffer */ /* ci_data() : returns the amount of input data in the channel's buffer */
static inline size_t ci_data(const struct channel *c) static inline size_t ci_data(const struct channel *c)
{ {
return c->buf->i; return c_data(c) - co_data(c);
} }
/* ci_next() : for an absolute pointer <p> or a relative offset <o> pointing to /* ci_next() : for an absolute pointer <p> or a relative offset <o> pointing to
@ -345,7 +345,7 @@ static inline unsigned long long channel_forward(struct channel *chn, unsigned l
if (bytes <= ~0U) { if (bytes <= ~0U) {
unsigned int bytes32 = bytes; unsigned int bytes32 = bytes;
if (bytes32 <= chn->buf->i) { if (bytes32 <= ci_data(chn)) {
/* OK this amount of bytes might be forwarded at once */ /* OK this amount of bytes might be forwarded at once */
c_adv(chn, bytes32); c_adv(chn, bytes32);
return bytes; return bytes;
@ -357,7 +357,7 @@ static inline unsigned long long channel_forward(struct channel *chn, unsigned l
/* Forwards any input data and marks the channel for permanent forwarding */ /* Forwards any input data and marks the channel for permanent forwarding */
static inline void channel_forward_forever(struct channel *chn) static inline void channel_forward_forever(struct channel *chn)
{ {
c_adv(chn, chn->buf->i); c_adv(chn, ci_data(chn));
chn->to_forward = CHN_INFINITE_FORWARD; chn->to_forward = CHN_INFINITE_FORWARD;
} }
@ -372,7 +372,7 @@ static inline void channel_forward_forever(struct channel *chn)
*/ */
static inline unsigned int channel_is_empty(const struct channel *c) static inline unsigned int channel_is_empty(const struct channel *c)
{ {
return !(c->buf->o | (long)c->pipe); return !(co_data(c) | (long)c->pipe);
} }
/* Returns non-zero if the channel is rewritable, which means that the buffer /* Returns non-zero if the channel is rewritable, which means that the buffer
@ -384,8 +384,7 @@ static inline int channel_is_rewritable(const struct channel *chn)
{ {
int rem = chn->buf->size; int rem = chn->buf->size;
rem -= chn->buf->o; rem -= b_data(chn->buf);
rem -= chn->buf->i;
rem -= global.tune.maxrewrite; rem -= global.tune.maxrewrite;
return rem >= 0; return rem >= 0;
} }
@ -417,8 +416,7 @@ static inline int channel_may_recv(const struct channel *chn)
if (chn->buf == &buf_empty) if (chn->buf == &buf_empty)
return 1; return 1;
rem -= chn->buf->o; rem -= b_data(chn->buf);
rem -= chn->buf->i;
if (!rem) if (!rem)
return 0; /* buffer already full */ return 0; /* buffer already full */
@ -435,7 +433,7 @@ static inline int channel_may_recv(const struct channel *chn)
* the reserve, and we want to ensure they're covered by scheduled * the reserve, and we want to ensure they're covered by scheduled
* forwards. * forwards.
*/ */
rem = chn->buf->i + global.tune.maxrewrite - chn->buf->size; rem = ci_data(chn) + global.tune.maxrewrite - chn->buf->size;
return rem < 0 || (unsigned int)rem < chn->to_forward; return rem < 0 || (unsigned int)rem < chn->to_forward;
} }
@ -628,7 +626,7 @@ static inline int channel_recv_limit(const struct channel *chn)
* - if o + to_forward >= maxrw => return size [ large enough ] * - if o + to_forward >= maxrw => return size [ large enough ]
* - otherwise return size - (maxrw - (o + to_forward)) * - otherwise return size - (maxrw - (o + to_forward))
*/ */
transit = chn->buf->o + chn->to_forward; transit = co_data(chn) + chn->to_forward;
reserve -= transit; reserve -= transit;
if (transit < chn->to_forward || // addition overflow if (transit < chn->to_forward || // addition overflow
transit >= (unsigned)global.tune.maxrewrite) // enough transit data transit >= (unsigned)global.tune.maxrewrite) // enough transit data
@ -651,7 +649,7 @@ static inline int channel_full(const struct channel *c, unsigned int reserve)
if (c->buf == &buf_empty) if (c->buf == &buf_empty)
return 0; return 0;
return (b_data(c->buf) - co_data(c) + reserve >= c_size(c)); return (ci_data(c) + reserve >= c_size(c));
} }
@ -664,7 +662,7 @@ static inline int channel_recv_max(const struct channel *chn)
{ {
int ret; int ret;
ret = channel_recv_limit(chn) - chn->buf->i - chn->buf->o; ret = channel_recv_limit(chn) - b_data(chn->buf);
if (ret < 0) if (ret < 0)
ret = 0; ret = 0;
return ret; return ret;
@ -740,11 +738,11 @@ static inline void channel_release_buffer(struct channel *chn, struct buffer_wai
*/ */
static inline void channel_truncate(struct channel *chn) static inline void channel_truncate(struct channel *chn)
{ {
if (!chn->buf->o) if (!co_data(chn))
return channel_erase(chn); return channel_erase(chn);
chn->to_forward = 0; chn->to_forward = 0;
if (!chn->buf->i) if (!ci_data(chn))
return; return;
chn->buf->i = 0; chn->buf->i = 0;

3
include/proto/proto_http.h
View File

@ -27,6 +27,7 @@
#include <types/proto_http.h> #include <types/proto_http.h>
#include <types/stream.h> #include <types/stream.h>
#include <types/task.h> #include <types/task.h>
#include <proto/channel.h>
#include <proto/h1.h> #include <proto/h1.h>
/* /*
@ -221,7 +222,7 @@ static inline int http_body_bytes(const struct http_msg *msg)
{ {
int len; int len;
len = msg->chn->buf->i - msg->sov - msg->sol; len = ci_data(msg->chn) - msg->sov - msg->sol;
if (len > msg->body_len) if (len > msg->body_len)
len = msg->body_len; len = msg->body_len;
return len; return len;