RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-03 08:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: buffer: replace buffer_pending() with ci_data()

Browse Source 
It used to return b->i for channels, which is what ci_data() does.
This commit is contained in:
Willy Tarreau 2018-06-15 15:14:53 +02:00
parent 3f6799975f
commit 5ba65521a3
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/common/buffer.h
View File

@ -103,14 +103,6 @@ static inline int buffer_count(const struct buffer *buf, const char *from, const
return count;
}
/* returns the amount of pending bytes in the buffer. It is the amount of bytes
* that is not scheduled to be sent.
*/
static inline int buffer_pending(const struct buffer *buf)
{
return buf->i;
}
/* Return 1 if the buffer has less than 1/4 of its capacity free, otherwise 0 */
static inline int buffer_almost_full(const struct buffer *buf)
{

2
src/filters.c
View File

@ -1094,7 +1094,7 @@ flt_xfer_data(struct stream *s, struct channel *chn, unsigned int an_bit)
/* Stop waiting data if the input in closed and no data is pending or if
* the output is closed. */
if ((chn->flags & CF_SHUTW) ||
((chn->flags & CF_SHUTR) && !buffer_pending(chn->buf))) {
((chn->flags & CF_SHUTR) && !ci_data(chn))) {
ret = 1;
goto end;
}

2
src/proto_http.c
View File

@ -6158,7 +6158,7 @@ int http_response_forward_body(struct stream *s, struct channel *res, int an_bit
if ((s->req.flags & (CF_SHUTR|CF_SHUTW)) == (CF_SHUTR|CF_SHUTW))
goto aborted_xfer;
/* If we have some pending data, we continue the processing */
if (!buffer_pending(res->buf)) {
if (!ci_data(res)) {
if (!(s->flags & SF_ERR_MASK))
s->flags |= SF_ERR_SRVCL;
HA_ATOMIC_ADD(&s->be->be_counters.srv_aborts, 1);