mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

[CLEANUP] replace a few occurrences of (flags & X) && !(flags & Y)

Browse Source 
This construct collapses into ((flags & (X|Y)) == X) when X is a
single-bit flag. This provides a noticeable code shrink and the
output code results in less conditional jumps.
This commit is contained in:
Willy Tarreau 2009-01-09 12:18:24 +01:00
parent 68eac13217
commit efc612c17b
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/session.c
View File

@ -184,7 +184,7 @@ int sess_update_st_con_tcp(struct session *s, struct stream_interface *si)
if (unlikely((req->flags & BF_SHUTW_NOW) || if (unlikely((req->flags & BF_SHUTW_NOW) ||
(rep->flags & BF_SHUTW) || (rep->flags & BF_SHUTW) ||
((req->flags & BF_SHUTR) && /* FIXME: this should not prevent a connection from establishing */ ((req->flags & BF_SHUTR) && /* FIXME: this should not prevent a connection from establishing */
((req->flags & BF_EMPTY && !(req->flags & BF_WRITE_ACTIVITY)) || (((req->flags & (BF_EMPTY|BF_WRITE_ACTIVITY)) == BF_EMPTY) ||
s->be->options & PR_O_ABRT_CLOSE)))) { s->be->options & PR_O_ABRT_CLOSE)))) {
/* give up */ /* give up */
si->shutw(si); si->shutw(si);

22
src/stream_sock.c
View File

@ -241,16 +241,17 @@ int stream_sock_read(int fd) {
goto out_skip_wakeup; goto out_skip_wakeup;
out_wakeup: out_wakeup:
/* the consumer might be waiting for data */ /* the consumer might be waiting for data */
if (b->cons->flags & SI_FL_WAIT_DATA && (b->flags & BF_READ_PARTIAL) && !(b->flags & BF_EMPTY)) if (likely((b->flags & (BF_READ_PARTIAL|BF_EMPTY)) == BF_READ_PARTIAL &&
(b->cons->flags & SI_FL_WAIT_DATA)))
b->cons->chk_snd(b->cons); b->cons->chk_snd(b->cons);
/* we have to wake up if there is a special event or if we don't have /* we have to wake up if there is a special event or if we don't have
* any more data to forward. * any more data to forward.
*/ */
if ((b->flags & (BF_READ_NULL|BF_READ_ERROR|BF_SHUTR)) || if (likely((b->flags & (BF_READ_NULL|BF_READ_ERROR|BF_SHUTR)) ||
!b->to_forward || !b->to_forward ||
si->state != SI_ST_EST || si->state != SI_ST_EST ||
b->cons->state != SI_ST_EST) b->cons->state != SI_ST_EST))
task_wakeup(si->owner, TASK_WOKEN_IO); task_wakeup(si->owner, TASK_WOKEN_IO);
out_skip_wakeup: out_skip_wakeup:
@ -461,16 +462,17 @@ int stream_sock_write(int fd) {
goto out_skip_wakeup; goto out_skip_wakeup;
out_wakeup: out_wakeup:
/* the producer might be waiting for more room to store data */ /* the producer might be waiting for more room to store data */
if ((b->prod->flags & SI_FL_WAIT_ROOM) && (b->flags & BF_WRITE_PARTIAL) && !(b->flags & BF_FULL)) if (likely((b->flags & (BF_WRITE_PARTIAL|BF_FULL)) == BF_WRITE_PARTIAL &&
(b->prod->flags & SI_FL_WAIT_ROOM)))
b->prod->chk_rcv(b->prod); b->prod->chk_rcv(b->prod);
/* we have to wake up if there is a special event or if we don't have /* we have to wake up if there is a special event or if we don't have
* any more data to forward and it's not planned to send any more. * any more data to forward and it's not planned to send any more.
*/ */
if ((b->flags & (BF_WRITE_NULL|BF_WRITE_ERROR|BF_SHUTW)) || if (likely((b->flags & (BF_WRITE_NULL|BF_WRITE_ERROR|BF_SHUTW)) ||
(!b->to_forward && !b->send_max && !b->splice_len) || (!b->to_forward && !b->send_max && !b->splice_len) ||
si->state != SI_ST_EST || si->state != SI_ST_EST ||
b->prod->state != SI_ST_EST) b->prod->state != SI_ST_EST))
task_wakeup(si->owner, TASK_WOKEN_IO); task_wakeup(si->owner, TASK_WOKEN_IO);
out_skip_wakeup: out_skip_wakeup: