X-Git-Url: https://ruderich.org/simon/gitweb/?p=coloredstderr%2Fcoloredstderr.git;a=blobdiff_plain;f=src%2Fhookmacros.h;h=0eb47cd67abd45451dc85b02e0573a7e04119ced;hp=35e64703ddcc1933891ea8645d155c6edea9282f;hb=048bd6f9e7f316aafede310ba273776d0086b8ed;hpb=9862b8c8f13fe3d5a6012a8d67562bdaef48b8af diff --git a/src/hookmacros.h b/src/hookmacros.h index 35e6470..0eb47cd 100644 --- a/src/hookmacros.h +++ b/src/hookmacros.h @@ -56,10 +56,10 @@ #define _HOOK_PRE(type, name) \ int handle; \ - if (!(real_ ## name )) { \ + if (unlikely(!(real_ ## name ))) { \ *(void **) (&(real_ ## name)) = dlsym_function(#name); \ /* Initialize our data while we're at it. */ \ - if (!initialized) { \ + if (unlikely(!initialized)) { \ init_from_environment(); \ } \ } @@ -68,8 +68,8 @@ _HOOK_PRE_FD_(type, name, fd) #define _HOOK_PRE_FD_(type, name, fd) \ _HOOK_PRE(type, name) \ - if (tracked_fds_find(fd)) { \ - if (force_write_to_non_tty) { \ + if (unlikely(tracked_fds_find(fd))) { \ + if (unlikely(force_write_to_non_tty)) { \ handle = 1; \ } else { \ handle = isatty(fd); \ @@ -77,14 +77,14 @@ } else { \ handle = 0; \ } \ - if (handle) { \ + if (unlikely(handle)) { \ handle_fd_pre(fd); \ } #define _HOOK_PRE_FILE(type, name, file) \ type result; \ _HOOK_PRE(type, name) \ - if (tracked_fds_find(fileno(file))) { \ - if (force_write_to_non_tty) { \ + if (unlikely(tracked_fds_find(fileno(file)))) { \ + if (unlikely(force_write_to_non_tty)) { \ handle = 1; \ } else { \ handle = isatty(fileno(file)); \ @@ -92,18 +92,18 @@ } else { \ handle = 0; \ } \ - if (handle) { \ + if (unlikely(handle)) { \ handle_file_pre(file); \ } #define _HOOK_POST_FD_(fd) \ - if (handle) { \ + if (unlikely(handle)) { \ handle_fd_post(fd); \ } #define _HOOK_POST_FD(fd) \ _HOOK_POST_FD_(fd) \ return result; #define _HOOK_POST_FILE(file) \ - if (handle) { \ + if (unlikely(handle)) { \ handle_file_post(file); \ } \ return result;