MINOR: http: replace http_message_realign() with buffer_slow_realign()
There is no more reason for the realign function being HTTP specific,
it only operates on a buffer now. Let's move it to buffers.c instead.
It's likely that buffer_bounce_realign is broken (not used), this will
have to be inspected. The function is worth rewriting as it can be
cheaper than buffer_slow_realign() to realign large wrapping buffers.
diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index 3b98f17..6f8e2c1 100644
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -48,6 +48,7 @@
int buffer_replace2(struct buffer *b, char *pos, char *end, const char *str, int len);
int buffer_insert_line2(struct buffer *b, char *pos, const char *str, int len);
void buffer_dump(FILE *o, struct buffer *b, int from, int to);
+void buffer_slow_realign(struct buffer *buf);
void buffer_bounce_realign(struct buffer *buf);
unsigned long long buffer_forward(struct buffer *buf, unsigned long long bytes);
diff --git a/src/buffers.c b/src/buffers.c
index e71f852..7becb48 100644
--- a/src/buffers.c
+++ b/src/buffers.c
@@ -388,6 +388,34 @@
}
+/* This function realigns input data in a possibly wrapping buffer so that it
+ * becomes contiguous and starts at the beginning of the buffer area. The
+ * function may only be used when the buffer's output is empty.
+ */
+void buffer_slow_realign(struct buffer *buf)
+{
+ /* two possible cases :
+ * - the buffer is in one contiguous block, we move it in-place
+ * - the buffer is in two blocks, we move it via the swap_buffer
+ */
+ if (buf->i) {
+ int block1 = buf->i;
+ int block2 = 0;
+ if (buf->p + buf->i > buf->data + buf->size) {
+ /* non-contiguous block */
+ block1 = buf->data + buf->size - buf->p;
+ block2 = buf->p + buf->i - (buf->data + buf->size);
+ }
+ if (block2)
+ memcpy(swap_buffer, buf->data, block2);
+ memmove(buf->data, buf->p, block1);
+ if (block2)
+ memcpy(buf->data + block1, swap_buffer, block2);
+ }
+
+ buf->p = buf->data;
+}
+
/* Realigns a possibly non-contiguous buffer by bouncing bytes from source to
* destination. It does not use any intermediate buffer and does the move in
* place, though it will be slower than a simple memmove() on contiguous data,
diff --git a/src/proto_http.c b/src/proto_http.c
index 637c856..3db7de1 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -1961,40 +1961,6 @@
return 1;
}
-/* This function realigns a possibly wrapping http message at the beginning
- * of its buffer. The function may only be used when the buffer's tail is
- * empty.
- */
-void http_message_realign(struct http_msg *msg)
-{
- struct buffer *buf = msg->buf;
-
- /* two possible cases :
- * - the buffer is in one contiguous block, we move it in-place
- * - the buffer is in two blocks, we move it via the swap_buffer
- */
- if (buf->i) {
- int block1 = buf->i;
- int block2 = 0;
- if (buf->p + buf->i > buf->data + buf->size) {
- /* non-contiguous block */
- block1 = buf->data + buf->size - buf->p;
- block2 = buf->p + buf->i - (buf->data + buf->size);
- }
- if (block2)
- memcpy(swap_buffer, buf->data, block2);
- memmove(buf->data, buf->p, block1);
- if (block2)
- memcpy(buf->data + block1, swap_buffer, block2);
- }
-
- /* adjust all known pointers */
- buf->p = buf->data;
- buf->flags &= ~BF_FULL;
- if (bi_full(buf))
- buf->flags |= BF_FULL;
-}
-
/* This stream analyser waits for a complete HTTP request. It returns 1 if the
* processing can continue on next analysers, or zero if it either needs more
* data or wants to immediately abort the request (eg: timeout, error, ...). It
@@ -2063,7 +2029,7 @@
}
if (bi_end(req) < b_ptr(req, msg->next) ||
bi_end(req) > req->data + req->size - global.tune.maxrewrite)
- http_message_realign(msg);
+ buffer_slow_realign(msg->buf);
}
/* Note that we have the same problem with the response ; we
@@ -4473,7 +4439,7 @@
return 0;
}
if (rep->i <= rep->size - global.tune.maxrewrite)
- http_message_realign(msg);
+ buffer_slow_realign(msg->buf);
}
if (likely(msg->next < rep->i))