From: Willy Tarreau Date: Sat, 18 Mar 2017 16:40:22 +0000 (+0100) Subject: CLEANUP: connection: completely remove CO_FL_WAKE_DATA X-Git-Tag: v1.8-dev1~70 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de40d798decc8d6a24fe6b4609b6bdcb14d7ba54;p=thirdparty%2Fhaproxy.git CLEANUP: connection: completely remove CO_FL_WAKE_DATA Since it's only set and never tested anymore, let's remove it. --- diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c index bc71bde969..cf11a71f1b 100644 --- a/contrib/debug/flags.c +++ b/contrib/debug/flags.c @@ -118,7 +118,6 @@ void show_conn_flags(unsigned int f) SHOW_FLAG(f, CO_FL_SOCK_RD_SH); SHOW_FLAG(f, CO_FL_DATA_WR_SH); SHOW_FLAG(f, CO_FL_DATA_RD_SH); - SHOW_FLAG(f, CO_FL_WAKE_DATA); SHOW_FLAG(f, CO_FL_INIT_DATA); SHOW_FLAG(f, CO_FL_ADDR_TO_SET); SHOW_FLAG(f, CO_FL_ADDR_FROM_SET); diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h index 525b6cf2c6..391d8714e8 100644 --- a/include/proto/stream_interface.h +++ b/include/proto/stream_interface.h @@ -356,9 +356,6 @@ static inline int si_connect(struct stream_interface *si) if (ret != SF_ERR_NONE) return ret; - /* we need to be notified about connection establishment */ - conn->flags |= CO_FL_WAKE_DATA; - /* we're in the process of establishing a connection */ si->state = SI_ST_CON; } diff --git a/include/types/connection.h b/include/types/connection.h index 657c9a1479..5ce5e0cc52 100644 --- a/include/types/connection.h +++ b/include/types/connection.h @@ -88,7 +88,7 @@ enum { /* flags indicating what event type the data layer is interested in */ CO_FL_INIT_DATA = 0x00004000, /* initialize the data layer before using it */ - CO_FL_WAKE_DATA = 0x00008000, /* wake-up data layer upon activity at the transport layer */ + /* unused : 0x00008000 */ /* flags used to remember what shutdown have been performed/reported */ CO_FL_DATA_RD_SH = 0x00010000, /* DATA layer was notified about shutr/read0 */ diff --git a/src/checks.c b/src/checks.c index dba45f0c80..77d57dc871 100644 --- a/src/checks.c +++ b/src/checks.c @@ -1559,7 +1559,6 @@ static int connect_conn_chk(struct task *t) ret = SF_ERR_INTERNAL; if (proto->connect) ret = proto->connect(conn, check->type, quickack ? 2 : 0); - conn->flags |= CO_FL_WAKE_DATA; if (s->check.send_proxy) { conn->send_proxy_ofs = 1; conn->flags |= CO_FL_SEND_PROXY; @@ -2753,7 +2752,6 @@ static void tcpcheck_main(struct connection *conn) ret = proto->connect(conn, 1 /* I/O polling is always needed */, (next && next->action == TCPCHK_ACT_EXPECT) ? 0 : 2); - conn->flags |= CO_FL_WAKE_DATA; if (check->current_step->conn_opts & TCPCHK_OPT_SEND_PROXY) { conn->send_proxy_ofs = 1; conn->flags |= CO_FL_SEND_PROXY; diff --git a/src/session.c b/src/session.c index 581897d791..34250eb537 100644 --- a/src/session.c +++ b/src/session.c @@ -253,16 +253,13 @@ int session_accept_fd(struct listener *l, int cfd, struct sockaddr_storage *addr t->process = session_expire_embryonic; t->expire = tick_add_ifset(now_ms, p->timeout.client); task_queue(t); - cli_conn->flags |= CO_FL_INIT_DATA | CO_FL_WAKE_DATA; + cli_conn->flags |= CO_FL_INIT_DATA; return 1; } /* OK let's complete stream initialization since there is no handshake */ cli_conn->flags |= CO_FL_CONNECTED; - /* we want the connection handler to notify the stream interface about updates. */ - cli_conn->flags |= CO_FL_WAKE_DATA; - /* if logs require transport layer information, note it on the connection */ if (sess->fe->to_log & LW_XPRT) cli_conn->flags |= CO_FL_XPRT_TRACKED; @@ -431,9 +428,6 @@ static int conn_complete_session(struct connection *conn) if (conn->flags & CO_FL_ERROR) goto fail; - /* we want the connection handler to notify the stream interface about updates. */ - conn->flags |= CO_FL_WAKE_DATA; - /* if logs require transport layer information, note it on the connection */ if (sess->fe->to_log & LW_XPRT) conn->flags |= CO_FL_XPRT_TRACKED;