X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fhookmacros.h;h=42273e4fd3f35c2f7ba1fda7695317b566fb54b3;hb=04334418fcce94a1b528bd4c935d8126876bda04;hp=35e64703ddcc1933891ea8645d155c6edea9282f;hpb=9862b8c8f13fe3d5a6012a8d67562bdaef48b8af;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/hookmacros.h b/src/hookmacros.h
index 35e6470..42273e4 100644
--- a/src/hookmacros.h
+++ b/src/hookmacros.h
@@ -38,7 +38,7 @@
  *         if (force_write_to_non_tty) {
  *             handle = 1;
  *         } else {
- *             handle = isatty(<fd>);
+ *             handle = isatty_noinline(<fd>);
  *         }
  *     } else {
  *         handle = 0;
@@ -54,56 +54,48 @@
  *     return result;
  */
 
-#define _HOOK_PRE(type, name) \
+#define _HOOK_PRE(type, name, fd) \
         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(); \
             } \
-        }
-#define _HOOK_PRE_FD(type, name, fd) \
-        type result; \
-        _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) { \
+        } \
+        /* Check if this fd should be handled. */ \
+        if (unlikely(tracked_fds_find(fd))) { \
+            if (unlikely(force_write_to_non_tty)) { \
                 handle = 1; \
             } else { \
-                handle = isatty(fd); \
+                handle = isatty_noinline(fd); \
             } \
         } else { \
             handle = 0; \
-        } \
-        if (handle) { \
+        }
+#define _HOOK_PRE_FD(type, name, fd) \
+        type result; \
+        _HOOK_PRE_FD_(type, name, fd)
+#define _HOOK_PRE_FD_(type, name, fd) \
+        _HOOK_PRE(type, name, fd) \
+        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) { \
-                handle = 1; \
-            } else { \
-                handle = isatty(fileno(file)); \
-            } \
-        } else { \
-            handle = 0; \
-        } \
-        if (handle) { \
+        _HOOK_PRE(type, name, fileno(file)) \
+        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;
@@ -117,6 +109,13 @@
         _HOOK_POST_FD_(fd) \
     }
 
+#define HOOK_FD2(type, name, fd, type1, arg1, type2, arg2) \
+    static type (*real_ ## name)(type1, type2); \
+    type name(type1 arg1, type2 arg2) { \
+        _HOOK_PRE_FD(type, name, fd) \
+        result = real_ ## name(arg1, arg2); \
+        _HOOK_POST_FD(fd) \
+    }
 #define HOOK_FD3(type, name, fd, type1, arg1, type2, arg2, type3, arg3) \
     static type (*real_ ## name)(type1, type2, type3); \
     type name(type1 arg1, type2 arg2, type3 arg3) { \
@@ -176,8 +175,7 @@
     }
 #define HOOK_VAR_FILE3(type, name, file, func, type1, arg1, type2, arg2, type3, arg3) \
     static type (*real_ ## func)(type1, type2, type3, va_list); \
-    type name(type1 arg1, type2 arg2, type3 arg3, ...) \
-    { \
+    type name(type1 arg1, type2 arg2, type3 arg3, ...) { \
         va_list ap; \
         _HOOK_PRE_FILE(type, func, file) \
         va_start(ap, arg3); \