MAJOR: channel: replace the struct buffer with a pointer to a buffer
With this commit, we now separate the channel from the buffer. This will
allow us to replace buffers on the fly without touching the channel. Since
nobody is supposed to keep a reference to a buffer anymore, doing so is not
a problem and will also permit some copy-less data manipulation.
Interestingly, these changes have shown a 2% performance increase on some
workloads, probably due to a better cache placement of data.
diff --git a/src/backend.c b/src/backend.c
index bae62b5..4528d0e 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -258,11 +258,11 @@
struct proxy *px = s->be;
unsigned int plen = px->url_param_len;
unsigned long len = msg->body_len;
- const char *params = b_ptr(&req->buf, (int)(msg->sov - req->buf.o));
+ const char *params = b_ptr(req->buf, (int)(msg->sov - req->buf->o));
const char *p = params;
- if (len > buffer_len(&req->buf) - msg->sov)
- len = buffer_len(&req->buf) - msg->sov;
+ if (len > buffer_len(req->buf) - msg->sov)
+ len = buffer_len(req->buf) - msg->sov;
if (len == 0)
return NULL;
@@ -343,7 +343,7 @@
ctx.idx = 0;
/* if the message is chunked, we skip the chunk size, but use the value as len */
- http_find_header2(px->hh_name, plen, b_ptr(&s->req->buf, (int)-s->req->buf.o), &txn->hdr_idx, &ctx);
+ http_find_header2(px->hh_name, plen, b_ptr(s->req->buf, (int)-s->req->buf->o), &txn->hdr_idx, &ctx);
/* if the header is not found or empty, let's fallback to round robin */
if (!ctx.idx || !ctx.vlen)
@@ -419,12 +419,12 @@
args[0].data.str.len = px->hh_len;
args[1].type = ARGT_STOP;
- b_rew(&s->req->buf, rewind = s->req->buf.o);
+ b_rew(s->req->buf, rewind = s->req->buf->o);
ret = smp_fetch_rdp_cookie(px, s, NULL, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, args, &smp);
len = smp.data.str.len;
- b_adv(&s->req->buf, rewind);
+ b_adv(s->req->buf, rewind);
if (ret == 0 || (smp.flags & SMP_F_MAY_CHANGE) || len == 0)
return NULL;
@@ -569,7 +569,7 @@
if (s->txn.req.msg_state < HTTP_MSG_BODY)
break;
srv = get_server_uh(s->be,
- b_ptr(&s->req->buf, (int)(s->txn.req.sl.rq.u - s->req->buf.o)),
+ b_ptr(s->req->buf, (int)(s->txn.req.sl.rq.u - s->req->buf->o)),
s->txn.req.sl.rq.u_l);
break;
@@ -579,7 +579,7 @@
break;
srv = get_server_ph(s->be,
- b_ptr(&s->req->buf, (int)(s->txn.req.sl.rq.u - s->req->buf.o)),
+ b_ptr(s->req->buf, (int)(s->txn.req.sl.rq.u - s->req->buf->o)),
s->txn.req.sl.rq.u_l);
if (!srv && s->txn.meth == HTTP_METH_POST)
@@ -905,13 +905,13 @@
((struct sockaddr_in *)&s->req->cons->conn.addr.from)->sin_port = 0;
((struct sockaddr_in *)&s->req->cons->conn.addr.from)->sin_addr.s_addr = 0;
- b_rew(&s->req->buf, rewind = s->req->buf.o);
+ b_rew(s->req->buf, rewind = s->req->buf->o);
if (http_get_hdr(&s->txn.req, srv->bind_hdr_name, srv->bind_hdr_len,
&s->txn.hdr_idx, srv->bind_hdr_occ, NULL, &vptr, &vlen)) {
((struct sockaddr_in *)&s->req->cons->conn.addr.from)->sin_addr.s_addr =
htonl(inetaddr_host_lim(vptr, vptr + vlen));
}
- b_adv(&s->req->buf, rewind);
+ b_adv(s->req->buf, rewind);
}
break;
default:
@@ -939,13 +939,13 @@
((struct sockaddr_in *)&s->req->cons->conn.addr.from)->sin_port = 0;
((struct sockaddr_in *)&s->req->cons->conn.addr.from)->sin_addr.s_addr = 0;
- b_rew(&s->req->buf, rewind = s->req->buf.o);
+ b_rew(s->req->buf, rewind = s->req->buf->o);
if (http_get_hdr(&s->txn.req, s->be->bind_hdr_name, s->be->bind_hdr_len,
&s->txn.hdr_idx, s->be->bind_hdr_occ, NULL, &vptr, &vlen)) {
((struct sockaddr_in *)&s->req->cons->conn.addr.from)->sin_addr.s_addr =
htonl(inetaddr_host_lim(vptr, vptr + vlen));
}
- b_adv(&s->req->buf, rewind);
+ b_adv(s->req->buf, rewind);
}
break;
default:
@@ -1144,7 +1144,7 @@
req,
req->rex, req->wex,
req->flags,
- req->buf.i,
+ req->buf->i,
req->analysers);
if (s->flags & SN_ASSIGNED)