X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=727c580895b7814d18bba43ec832e905ba7ff6b4;hb=86352712fdc5fa08777eca1458f4ef6bbe579e7b;hp=c36c2f732cb409732c0da90a2f87ed10ba448b42;hpb=fe3f7d4c635b265c58efd5bc420d32135ec7903e;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/coloredstderr.c b/src/coloredstderr.c
index c36c2f7..727c580 100644
--- a/src/coloredstderr.c
+++ b/src/coloredstderr.c
@@ -51,6 +51,7 @@ static int force_write_to_non_tty;
 
 
 #include "constants.h"
+#include "compiler.h"
 #ifdef DEBUG
 # include "debug.h"
 #endif
@@ -60,34 +61,28 @@ static int force_write_to_non_tty;
 
 
 
-/* Should the "action" handler be invoked for this file descriptor? */
-static int check_handle_fd(int fd) {
-    /* Load state from environment. Only necessary once per process. */
-    if (!initialized) {
-        init_from_environment();
-    }
+/* See hookmacros.h for the decision if a function call is colored. */
 
-    /* tracked_fds_find() is most likely faster than calling isatty(),
-     * therefore check if we are tracking this file descriptor first. */
-    if (!tracked_fds_find(fd)) {
-        return 0;
-    }
 
-    /* Never touch anything not going to a terminal - unless we are explicitly
-     * asked to do so. */
-    if (!force_write_to_non_tty && !isatty(fd)) {
-        return 0;
-    }
+/* Prevent inlining into hook functions because it may increase the number of
+ * spilled registers unnecessarily. As it's not called very often accept the
+ * additional call. */
+static int isatty_noinline(int fd) __noinline;
+static int isatty_noinline(int fd) {
+    int saved_errno = errno;
+    int result = isatty(fd);
+    errno = saved_errno;
 
-    return 1;
+    return result;
 }
 
+
 static void dup_fd(int oldfd, int newfd) {
 #ifdef DEBUG
     debug("%3d -> %3d\t\t\t[%d]\n", oldfd, newfd, getpid());
 #endif
 
-    if (!initialized) {
+    if (unlikely(!initialized)) {
         init_from_environment();
     }
 
@@ -109,7 +104,7 @@ static void close_fd(int fd) {
     debug("%3d ->   .\t\t\t[%d]\n", fd, getpid());
 #endif
 
-    if (!initialized) {
+    if (unlikely(!initialized)) {
         init_from_environment();
     }
 
@@ -141,29 +136,45 @@ inline static void init_pre_post_string(void) {
 }
 
 static void handle_fd_pre(int fd) {
-    if (!pre_string || !post_string) {
+    int saved_errno = errno;
+
+    if (unlikely(!pre_string || !post_string)) {
         init_pre_post_string();
     }
 
     DLSYM_FUNCTION(real_write, "write");
     real_write(fd, pre_string, pre_string_size);
+
+    errno = saved_errno;
 }
 static void handle_fd_post(int fd) {
+    int saved_errno = errno;
+
     /* write() already loaded above in handle_fd_pre(). */
     real_write(fd, post_string, post_string_size);
+
+    errno = saved_errno;
 }
 
 static void handle_file_pre(FILE *stream) {
-    if (!pre_string || !post_string) {
+    int saved_errno = errno;
+
+    if (unlikely(!pre_string || !post_string)) {
         init_pre_post_string();
     }
 
     DLSYM_FUNCTION(real_fwrite, "fwrite");
     real_fwrite(pre_string, pre_string_size, 1, stream);
+
+    errno = saved_errno;
 }
 static void handle_file_post(FILE *stream) {
+    int saved_errno = errno;
+
     /* fwrite() already loaded above in handle_file_pre(). */
     real_fwrite(post_string, post_string_size, 1, stream);
+
+    errno = saved_errno;
 }
 
 
@@ -303,9 +314,7 @@ int dup(int oldfd) {
 
     newfd = real_dup(oldfd);
     if (newfd != -1) {
-        int saved_errno = errno;
         dup_fd(oldfd, newfd);
-        errno = saved_errno;
     }
 
     return newfd;
@@ -315,9 +324,7 @@ int dup2(int oldfd, int newfd) {
 
     newfd = real_dup2(oldfd, newfd);
     if (newfd != -1) {
-        int saved_errno = errno;
         dup_fd(oldfd, newfd);
-        errno = saved_errno;
     }
 
     return newfd;
@@ -327,9 +334,7 @@ int dup3(int oldfd, int newfd, int flags) {
 
     newfd = real_dup3(oldfd, newfd, flags);
     if (newfd != -1) {
-        int saved_errno = errno;
         dup_fd(oldfd, newfd);
-        errno = saved_errno;
     }
 
     return newfd;
@@ -361,9 +366,7 @@ int fcntl(int fd, int cmd, ...) {
 
     /* We only care about duping fds. */
     if (cmd == F_DUPFD && result != -1) {
-        int saved_errno = errno;
         dup_fd(fd, result);
-        errno = saved_errno;
     }
 
     return result;