RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-02 17:41:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: conn: Do not pass a pointer to likely

Browse Source 
Move the `!` inside the likely and negate it to unlikely.

The previous version should not have caused issues, because it is converted
to a boolean / integral value before being passed to __builtin_expect(), but
it's certainly unusual.

[wt: this was not a bug but purposely written like this to improve code
 generation on older compilers but not needed anymore as described here:
 https://www.mail-archive.com/haproxy@formilux.org/msg36392.html ]
This commit is contained in:
Tim Duesterhus 2020-02-21 13:02:03 +01:00 committed by Willy Tarreau
parent 89ee79845c
commit 927063b892
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/proto/connection.h
View File

@ -400,12 +400,12 @@ static inline struct conn_stream *cs_new(struct connection *conn)
struct conn_stream *cs;
cs = pool_alloc(pool_head_connstream);
if (!likely(cs))
if (unlikely(!cs))
return NULL;
if (!conn) {
conn = conn_new();
if (!likely(conn)) {
if (unlikely(!conn)) {
cs_free(cs);
return NULL;
}