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

CLEANUP: channel: Remove the unused flag CF_WAKE_CONNECT

Browse Source 
This flag is tested or cleared but never set anymore.
This commit is contained in:
Christopher Faulet 2019-07-16 14:43:08 +02:00
parent 3716ebc50f
commit 22dc248c2a
4 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/debug/flags.c
View File

@ -97,7 +97,6 @@ void show_chn_flags(unsigned int f)
SHOW_FLAG(f, CF_READ_NOEXP); SHOW_FLAG(f, CF_READ_NOEXP);
SHOW_FLAG(f, CF_SHUTR_NOW); SHOW_FLAG(f, CF_SHUTR_NOW);
SHOW_FLAG(f, CF_SHUTR); SHOW_FLAG(f, CF_SHUTR);
SHOW_FLAG(f, CF_WAKE_CONNECT);
SHOW_FLAG(f, CF_READ_ERROR); SHOW_FLAG(f, CF_READ_ERROR);
SHOW_FLAG(f, CF_READ_TIMEOUT); SHOW_FLAG(f, CF_READ_TIMEOUT);
SHOW_FLAG(f, CF_READ_PARTIAL); SHOW_FLAG(f, CF_READ_PARTIAL);

2
include/types/channel.h
View File

@ -57,7 +57,7 @@
#define CF_READ_ERROR 0x00000008 /* unrecoverable error on producer side */ #define CF_READ_ERROR 0x00000008 /* unrecoverable error on producer side */
#define CF_READ_ACTIVITY (CF_READ_NULL|CF_READ_PARTIAL|CF_READ_ERROR) #define CF_READ_ACTIVITY (CF_READ_NULL|CF_READ_PARTIAL|CF_READ_ERROR)
#define CF_WAKE_CONNECT 0x00000010 /* wake the task up after connect succeeds */ /* unused: 0x00000010 */
#define CF_SHUTR 0x00000020 /* producer has already shut down */ #define CF_SHUTR 0x00000020 /* producer has already shut down */
#define CF_SHUTR_NOW 0x00000040 /* the producer must shut down for reads ASAP */ #define CF_SHUTR_NOW 0x00000040 /* the producer must shut down for reads ASAP */
#define CF_READ_NOEXP 0x00000080 /* producer should not expire */ #define CF_READ_NOEXP 0x00000080 /* producer should not expire */

2
src/cli.c
View File

@ -2324,7 +2324,7 @@ int pcli_wait_for_response(struct stream *s, struct channel *rep, int an_bit)
s->si[1].conn_retries = 0; /* used for logging too */ s->si[1].conn_retries = 0; /* used for logging too */
s->si[1].exp = TICK_ETERNITY; s->si[1].exp = TICK_ETERNITY;
s->si[1].flags &= SI_FL_ISBACK | SI_FL_DONT_WAKE; /* we're in the context of process_stream */ s->si[1].flags &= SI_FL_ISBACK | SI_FL_DONT_WAKE; /* we're in the context of process_stream */
s->req.flags &= ~(CF_SHUTW|CF_SHUTW_NOW|CF_AUTO_CONNECT|CF_WRITE_ERROR|CF_STREAMER|CF_STREAMER_FAST|CF_NEVER_WAIT|CF_WAKE_CONNECT|CF_WROTE_DATA); s->req.flags &= ~(CF_SHUTW|CF_SHUTW_NOW|CF_AUTO_CONNECT|CF_WRITE_ERROR|CF_STREAMER|CF_STREAMER_FAST|CF_NEVER_WAIT|CF_WROTE_DATA);
s->res.flags &= ~(CF_SHUTR|CF_SHUTR_NOW|CF_READ_ATTACHED|CF_READ_ERROR|CF_READ_NOEXP|CF_STREAMER|CF_STREAMER_FAST|CF_WRITE_PARTIAL|CF_NEVER_WAIT|CF_WROTE_DATA|CF_READ_NULL); s->res.flags &= ~(CF_SHUTR|CF_SHUTR_NOW|CF_READ_ATTACHED|CF_READ_ERROR|CF_READ_NOEXP|CF_STREAMER|CF_STREAMER_FAST|CF_WRITE_PARTIAL|CF_NEVER_WAIT|CF_WROTE_DATA|CF_READ_NULL);
s->flags &= ~(SF_DIRECT|SF_ASSIGNED|SF_ADDR_SET|SF_BE_ASSIGNED|SF_FORCE_PRST|SF_IGNORE_PRST); s->flags &= ~(SF_DIRECT|SF_ASSIGNED|SF_ADDR_SET|SF_BE_ASSIGNED|SF_FORCE_PRST|SF_IGNORE_PRST);
s->flags &= ~(SF_CURR_SESS|SF_REDIRECTABLE|SF_SRV_REUSED); s->flags &= ~(SF_CURR_SESS|SF_REDIRECTABLE|SF_SRV_REUSED);

9
src/stream.c
View File

@ -905,15 +905,6 @@ static void sess_establish(struct stream *s)
si->err_type = SI_ET_DATA_ERR; si->err_type = SI_ET_DATA_ERR;
} }
/* If the request channel is waiting for the connect(), we mark the read
* side as attached on the response channel and we wake up it once. So
* it will have a chance to forward data now.
*/
if (req->flags & CF_WAKE_CONNECT) {
req->flags |= CF_WAKE_ONCE;
req->flags &= ~CF_WAKE_CONNECT;
}
if (objt_server(s->target)) if (objt_server(s->target))
health_adjust(objt_server(s->target), HANA_STATUS_L4_OK); health_adjust(objt_server(s->target), HANA_STATUS_L4_OK);