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: xprt: merge recv_wait and send_wait in xprt_handshake

Browse Source 
This is the same principle as previous commit, but for xprt_handshake.
This commit is contained in:
Willy Tarreau 2020-01-10 09:08:22 +01:00
parent 7872d1fc15
commit ac6febd3ae
1 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/xprt_handshake.c
View File

@ -15,8 +15,7 @@
struct xprt_handshake_ctx { struct xprt_handshake_ctx {
struct connection *conn; struct connection *conn;
struct wait_event *send_wait; struct wait_event *subs;
struct wait_event *recv_wait;
struct wait_event wait_event; struct wait_event wait_event;
const struct xprt_ops *xprt; const struct xprt_ops *xprt;
void *xprt_ctx; void *xprt_ctx;
@ -87,21 +86,18 @@ out:
int ret = 0; int ret = 0;
int woke = 0; int woke = 0;
int was_conn_ctx = 0; int was_conn_ctx = 0;
/* On error, wake any waiter */ /* On error, wake any waiter */
if (ctx->recv_wait) { if (ctx->subs) {
ctx->recv_wait->events &= ~SUB_RETRY_RECV; tasklet_wakeup(ctx->subs->tasklet);
tasklet_wakeup(ctx->recv_wait->tasklet); ctx->subs->events = 0;
woke = 1; woke = 1;
ctx->recv_wait = NULL; ctx->subs = NULL;
}
if (ctx->send_wait) {
ctx->send_wait->events &= ~SUB_RETRY_SEND;
tasklet_wakeup(ctx->send_wait->tasklet);
woke = 1;
ctx->send_wait = NULL;
} }
if (!(conn->flags & CO_FL_ERROR)) if (!(conn->flags & CO_FL_ERROR))
conn->flags |= CO_FL_CONNECTED; conn->flags |= CO_FL_CONNECTED;
/* Remove ourself from the xprt chain */ /* Remove ourself from the xprt chain */
if (ctx->wait_event.events != 0) if (ctx->wait_event.events != 0)
ctx->xprt->unsubscribe(ctx->conn, ctx->xprt->unsubscribe(ctx->conn,
@ -162,7 +158,7 @@ static int xprt_handshake_init(struct connection *conn, void **xprt_ctx)
*/ */
ctx->xprt = NULL; ctx->xprt = NULL;
ctx->xprt_ctx = NULL; ctx->xprt_ctx = NULL;
ctx->send_wait = ctx->recv_wait = NULL; ctx->subs = NULL;
*xprt_ctx = ctx; *xprt_ctx = ctx;
return 0; return 0;
@ -177,13 +173,9 @@ static void xprt_handshake_close(struct connection *conn, void *xprt_ctx)
ctx->xprt->unsubscribe(ctx->conn, ctx->xprt_ctx, ctx->xprt->unsubscribe(ctx->conn, ctx->xprt_ctx,
ctx->wait_event.events, ctx->wait_event.events,
&ctx->wait_event); &ctx->wait_event);
if (ctx->send_wait) { if (ctx->subs) {
ctx->send_wait->events &= ~SUB_RETRY_SEND; ctx->subs->events = 0;
tasklet_wakeup(ctx->send_wait->tasklet); tasklet_wakeup(ctx->subs->tasklet);
}
if (ctx->recv_wait) {
ctx->recv_wait->events &= ~SUB_RETRY_RECV;
tasklet_wakeup(ctx->recv_wait->tasklet);
} }
if (ctx->xprt && ctx->xprt->close) if (ctx->xprt && ctx->xprt->close)
@ -206,46 +198,31 @@ static void xprt_handshake_close(struct connection *conn, void *xprt_ctx)
static int xprt_handshake_subscribe(struct connection *conn, void *xprt_ctx, int event_type, void *param) static int xprt_handshake_subscribe(struct connection *conn, void *xprt_ctx, int event_type, void *param)
{ {
struct wait_event *sw; struct wait_event *sw = param;
struct xprt_handshake_ctx *ctx = xprt_ctx; struct xprt_handshake_ctx *ctx = xprt_ctx;
if (event_type & SUB_RETRY_RECV) { BUG_ON(event_type & ~(SUB_RETRY_SEND|SUB_RETRY_RECV));
sw = param; BUG_ON(ctx->subs && ctx->subs->events & event_type);
BUG_ON(ctx->recv_wait != NULL || (sw->events & SUB_RETRY_RECV)); BUG_ON(ctx->subs && ctx->subs != sw);
sw->events |= SUB_RETRY_RECV;
ctx->recv_wait = sw; ctx->subs = sw;
event_type &= ~SUB_RETRY_RECV; sw->events |= event_type;
}
if (event_type & SUB_RETRY_SEND) {
sw = param;
BUG_ON(ctx->send_wait != NULL || (sw->events & SUB_RETRY_SEND));
sw->events |= SUB_RETRY_SEND;
ctx->send_wait = sw;
event_type &= ~SUB_RETRY_SEND;
}
if (event_type != 0)
return -1;
return 0; return 0;
} }
static int xprt_handshake_unsubscribe(struct connection *conn, void *xprt_ctx, int event_type, void *param) static int xprt_handshake_unsubscribe(struct connection *conn, void *xprt_ctx, int event_type, void *param)
{ {
struct wait_event *sw;
struct xprt_handshake_ctx *ctx = xprt_ctx; struct xprt_handshake_ctx *ctx = xprt_ctx;
struct wait_event *sw = param;
BUG_ON(event_type & ~(SUB_RETRY_SEND|SUB_RETRY_RECV));
BUG_ON(ctx->subs && ctx->subs != sw);
sw->events &= ~event_type;
if (!sw->events)
ctx->subs = NULL;
if (event_type & SUB_RETRY_RECV) {
sw = param;
BUG_ON(ctx->recv_wait != sw);
ctx->recv_wait = NULL;
sw->events &= ~SUB_RETRY_RECV;
}
if (event_type & SUB_RETRY_SEND) {
sw = param;
BUG_ON(ctx->send_wait != sw);
ctx->send_wait = NULL;
sw->events &= ~SUB_RETRY_SEND;
}
return 0; return 0;
} }