mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: channel: remove now unused ->prod and ->cons pointers

Browse Source 
Nothing uses them anymore.
This commit is contained in:
Willy Tarreau 2014-11-28 14:23:47 +01:00
parent 5decc05a9e
commit 81cd90069a
5 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/channel.h
View File

@ -82,7 +82,6 @@ static inline void channel_init(struct channel *chn)
chn->total = 0;
chn->pipe = NULL;
chn->analysers = 0;
chn->cons = NULL;
chn->flags = 0;
}

3
include/types/channel.h
View File

@ -24,7 +24,6 @@
#include <common/config.h>
#include <common/buffer.h>
#include <types/stream_interface.h>
/* The CF_* macros designate Channel Flags, which may be ORed in the bit field
* member 'flags' in struct channel. Here we have several types of flags :
@ -167,8 +166,6 @@ struct channel {
unsigned int flags; /* CF_* */
unsigned int analysers; /* bit field indicating what to do on the channel */
struct buffer *buf; /* buffer attached to the channel, always present but may move */
struct stream_interface *cons; /* consumer attached to this channel */
struct stream_interface *prod; /* producer attached to this channel */
struct pipe *pipe; /* non-NULL only when data present */
unsigned int to_forward; /* number of bytes to forward after out without a wake-up */
unsigned short last_read; /* 16 lower bits of last read date (max pause=65s) */

6
src/hlua.c
View File

@ -1910,12 +1910,6 @@ __LJMP static int hlua_socket_new(lua_State *L)
channel_init(&socket->s->res);
socket->s->res.flags |= CF_ISRESP;
socket->s->req.prod = &socket->s->si[0];
socket->s->req.cons = &socket->s->si[1];
socket->s->res.prod = &socket->s->si[1];
socket->s->res.cons = &socket->s->si[0];
socket->s->req.analysers = 0;
socket->s->req.rto = socket_proxy.timeout.client;
socket->s->req.wto = socket_proxy.timeout.server;

6
src/peers.c
View File

@ -1238,9 +1238,6 @@ static struct session *peer_session_create(struct peer *peer, struct peer_sessio
txn->hdr_idx.size = txn->hdr_idx.used = 0;
channel_init(&s->req);
s->req.prod = &s->si[0];
s->req.cons = &s->si[1];
s->req.flags |= CF_READ_ATTACHED; /* the producer is already connected */
/* activate default analysers enabled for this listener */
@ -1258,9 +1255,6 @@ static struct session *peer_session_create(struct peer *peer, struct peer_sessio
channel_init(&s->res);
s->res.flags |= CF_ISRESP;
s->res.prod = &s->si[1];
s->res.cons = &s->si[0];
s->res.rto = s->be->timeout.server;
s->res.wto = s->fe->timeout.client;

5
src/session.c
View File

@ -488,8 +488,6 @@ int session_complete(struct session *s)
s->store_count = 0;
channel_init(&s->req);
s->req.prod = &s->si[0];
s->req.cons = &s->si[1];
s->req.flags |= CF_READ_ATTACHED; /* the producer is already connected */
/* activate default analysers enabled for this listener */
@ -503,9 +501,6 @@ int session_complete(struct session *s)
channel_init(&s->res);
s->res.flags |= CF_ISRESP;
s->res.prod = &s->si[1];
s->res.cons = &s->si[0];
s->res.analysers = 0;
if (s->fe->options2 & PR_O2_NODELAY) {