[MINOR] add the splice_len member to the buffer struct in preparation of splice support
In preparation of splice support, let's add the splice_len member
to the buffer struct. An earlier implementation made it conditional,
which made the whole logics very complex due to a large number of
ifdefs.
Now BF_EMPTY is only set once both buf->l and buf->splice_len are
null. Splice_len is initialized to zero during buffer creation and
is currently not changed, so the whole logics remains unaffected.
When splice gets merged, splice_len will reflect the number of bytes
in flight out of the buffer but not yet sent, typically in a pipe for
the Linux case.
diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index ab0de11..edb3973 100644
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -48,6 +48,7 @@
buf->send_max = 0;
buf->to_forward = 0;
buf->l = buf->total = 0;
+ buf->splice_len = 0;
buf->analysers = 0;
buf->cons = NULL;
buf->flags = BF_EMPTY;
diff --git a/include/types/buffers.h b/include/types/buffers.h
index f15d33d..b310aed 100644
--- a/include/types/buffers.h
+++ b/include/types/buffers.h
@@ -127,6 +127,7 @@
int wto; /* write timeout, in ticks */
int cto; /* connect timeout, in ticks */
unsigned int l; /* data length */
+ unsigned int splice_len; /* number of bytes remaining in splice, out of buffer */
char *r, *w, *lr; /* read ptr, write ptr, last read */
char *rlim; /* read limit, used for header rewriting */
unsigned int send_max; /* number of bytes the sender can consume */
diff --git a/src/stream_sock.c b/src/stream_sock.c
index 82e1055..d10faa8 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -116,8 +116,8 @@
cur_read += ret;
/* if noone is interested in analysing data, let's forward everything */
- if (b->to_forward > b->send_max)
- b->send_max = MIN(b->to_forward, b->l);
+ if (b->to_forward - b->splice_len > b->send_max)
+ b->send_max = MIN(b->to_forward - b->splice_len, b->l);
if (fdtab[fd].state == FD_STCONN)
fdtab[fd].state = FD_STREADY;
@@ -406,7 +406,7 @@
b->w = b->data; /* wrap around the buffer */
}
- if (!b->l) {
+ if (!b->l && !b->splice_len) {
b->flags |= BF_EMPTY;
/* Maybe we just wrote the last chunk and need to close ? */
@@ -608,7 +608,7 @@
/* Check if we need to close the write side */
if (!(ob->flags & BF_SHUTW)) {
/* Write not closed, update FD status and timeout for writes */
- if ((ob->send_max == 0) ||
+ if ((ob->send_max == 0 && ob->splice_len == 0) ||
(ob->flags & BF_EMPTY) ||
(ob->flags & (BF_HIJACK|BF_WRITE_ENA)) == 0) {
/* stop writing */
@@ -693,7 +693,7 @@
if (unlikely(si->state != SI_ST_EST || (ob->flags & BF_SHUTW)))
return;
- if ((ob->send_max == 0) ||
+ if ((ob->send_max == 0 && ob->splice_len == 0) ||
(ob->flags & BF_EMPTY) ||
(ob->flags & (BF_HIJACK|BF_WRITE_ENA)) == 0) {
/* stop writing */