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

MAJOR: raw_sock: temporarily disable splicing

Browse Source 
It's too hard to convert splicing to connection+buf for now, so let's disable
it in order to make progress.
This commit is contained in:
Willy Tarreau 2012-08-20 20:21:01 +02:00 committed by Willy Tarreau
parent 2ba4465086
commit af978c4170
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/raw_sock.c
View File

@ -46,7 +46,7 @@
static void sock_raw_read(struct connection *conn); static void sock_raw_read(struct connection *conn);
#if defined(CONFIG_HAP_LINUX_SPLICE) #if 0 && defined(CONFIG_HAP_LINUX_SPLICE)
#include <common/splice.h> #include <common/splice.h>
/* A pipe contains 16 segments max, and it's common to see segments of 1448 bytes /* A pipe contains 16 segments max, and it's common to see segments of 1448 bytes
@ -312,7 +312,7 @@ static void sock_raw_read(struct connection *conn)
if (b->flags & BF_SHUTR) if (b->flags & BF_SHUTR)
return; return;
#if defined(CONFIG_HAP_LINUX_SPLICE) #if 0 && defined(CONFIG_HAP_LINUX_SPLICE)
if (b->to_forward >= MIN_SPLICE_FORWARD && b->flags & BF_KERN_SPLICING) { if (b->to_forward >= MIN_SPLICE_FORWARD && b->flags & BF_KERN_SPLICING) {
/* Under Linux, if FD_POLL_HUP is set, we have reached the end. /* Under Linux, if FD_POLL_HUP is set, we have reached the end.
@ -490,7 +490,7 @@ static int sock_raw_write_loop(struct connection *conn)
int write_poll = MAX_WRITE_POLL_LOOPS; int write_poll = MAX_WRITE_POLL_LOOPS;
int ret, max; int ret, max;
#if defined(CONFIG_HAP_LINUX_SPLICE) #if 0 && defined(CONFIG_HAP_LINUX_SPLICE)
while (b->pipe) { while (b->pipe) {
ret = splice(b->pipe->cons, NULL, si_fd(si), NULL, b->pipe->data, ret = splice(b->pipe->cons, NULL, si_fd(si), NULL, b->pipe->data,
SPLICE_F_MOVE|SPLICE_F_NONBLOCK); SPLICE_F_MOVE|SPLICE_F_NONBLOCK);