RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-07 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stream_interface: Don't use si_cs_send() as a task handler.

Browse Source 
Instead of using si_cs_send() as a task handler, define a new function,
si_cs_io_cb(), and give si_cs_send() its original prototype. Right now
si_cs_io_cb() just handles send, but later it'll handle recv() too.
This commit is contained in:
Olivier Houchard 2018-08-02 18:06:28 +02:00 committed by Willy Tarreau
parent e1c6dbcd70
commit 91894cbf4c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/proto/stream_interface.h
View File

@ -53,6 +53,7 @@ void stream_int_update(struct stream_interface *si);
void stream_int_update_conn(struct stream_interface *si); void stream_int_update_conn(struct stream_interface *si);
void stream_int_update_applet(struct stream_interface *si); void stream_int_update_applet(struct stream_interface *si);
void stream_int_notify(struct stream_interface *si); void stream_int_notify(struct stream_interface *si);
struct task *si_cs_io_cb(struct task *t, void *ctx, unsigned short state);
/* returns the channel which receives data from this stream interface (input channel) */ /* returns the channel which receives data from this stream interface (input channel) */
static inline struct channel *si_ic(struct stream_interface *si) static inline struct channel *si_ic(struct stream_interface *si)

19
src/stream_interface.c
View File

@ -55,7 +55,7 @@ static void si_cs_recv_cb(struct conn_stream *cs);
static int si_cs_wake_cb(struct conn_stream *cs); static int si_cs_wake_cb(struct conn_stream *cs);
static int si_idle_conn_wake_cb(struct conn_stream *cs); static int si_idle_conn_wake_cb(struct conn_stream *cs);
static void si_idle_conn_null_cb(struct conn_stream *cs); static void si_idle_conn_null_cb(struct conn_stream *cs);
static struct task * si_cs_send(struct task *t, void *ctx, unsigned short state); static struct task * si_cs_send(struct conn_stream *cs);
/* stream-interface operations for embedded tasks */ /* stream-interface operations for embedded tasks */
struct si_ops si_embedded_ops = { struct si_ops si_embedded_ops = {
@ -462,7 +462,7 @@ void stream_int_notify(struct stream_interface *si)
/* If we have data to send, try it now */ /* If we have data to send, try it now */
if (!channel_is_empty(oc) && objt_cs(si->end)) if (!channel_is_empty(oc) && objt_cs(si->end))
si_cs_send(NULL, objt_cs(si->end), 0); si_cs_send(objt_cs(si->end));
/* process consumer side */ /* process consumer side */
if (channel_is_empty(oc)) { if (channel_is_empty(oc)) {
@ -642,9 +642,8 @@ static int si_cs_wake_cb(struct conn_stream *cs)
* caller to commit polling changes. The caller should check conn->flags * caller to commit polling changes. The caller should check conn->flags
* for errors. * for errors.
*/ */
static struct task * si_cs_send(struct task *t, void *ctx, unsigned short state) static struct task * si_cs_send(struct conn_stream *cs)
{ {
struct conn_stream *cs = ctx;
struct connection *conn = cs->conn; struct connection *conn = cs->conn;
struct stream_interface *si = cs->data; struct stream_interface *si = cs->data;
struct channel *oc = si_oc(si); struct channel *oc = si_oc(si);
@ -661,7 +660,7 @@ static struct task * si_cs_send(struct task *t, void *ctx, unsigned short state)
if (conn->flags & CO_FL_HANDSHAKE) { if (conn->flags & CO_FL_HANDSHAKE) {
/* a handshake was requested */ /* a handshake was requested */
/* Schedule ourself to be woken up once the handshake is done */ /* Schedule ourself to be woken up once the handshake is done */
conn->xprt->subscribe(conn, SUB_CAN_SEND, wl_set_waitcb(&cs->wait_list, si_cs_send, ctx)); conn->xprt->subscribe(conn, SUB_CAN_SEND, wl_set_waitcb(&cs->wait_list, si_cs_io_cb, cs));
return NULL; return NULL;
} }
@ -741,7 +740,7 @@ static struct task * si_cs_send(struct task *t, void *ctx, unsigned short state)
} }
/* We couldn't send all of our data, let the mux know we'd like to send more */ /* We couldn't send all of our data, let the mux know we'd like to send more */
if (co_data(oc)) if (co_data(oc))
conn->mux->subscribe(cs, SUB_CAN_SEND, wl_set_waitcb(&cs->wait_list, si_cs_send, ctx)); conn->mux->subscribe(cs, SUB_CAN_SEND, wl_set_waitcb(&cs->wait_list, si_cs_io_cb, cs));
wake_others: wake_others:
/* Maybe somebody was waiting for this conn_stream, wake them */ /* Maybe somebody was waiting for this conn_stream, wake them */
@ -758,6 +757,12 @@ wake_others:
return NULL; return NULL;
} }
struct task *si_cs_io_cb(struct task *t, void *ctx, unsigned short state)
{
si_cs_send(ctx);
return (NULL);
}
/* This function is designed to be called from within the stream handler to /* This function is designed to be called from within the stream handler to
* update the channels' expiration timers and the stream interface's flags * update the channels' expiration timers and the stream interface's flags
* based on the channels' flags. It needs to be called only once after the * based on the channels' flags. It needs to be called only once after the
@ -1045,7 +1050,7 @@ static void stream_int_chk_snd_conn(struct stream_interface *si)
__cs_want_send(cs); __cs_want_send(cs);
si_cs_send(NULL, cs, 0); si_cs_send(cs);
if (cs->flags & CS_FL_ERROR || cs->conn->flags & CO_FL_ERROR) { if (cs->flags & CS_FL_ERROR || cs->conn->flags & CO_FL_ERROR) {
/* Write error on the file descriptor */ /* Write error on the file descriptor */
__cs_stop_both(cs); __cs_stop_both(cs);