X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fcoloredstderr.c;h=eae164dd93d168856440fbfbf09209cdd94eb60b;hb=7c2d726cd4c2716e9c211b5a5ab5d7713e1dfc5e;hp=68ef859dde35bb85915099b1d668bd72ae874b25;hpb=06f483dbeece72fa46fe43700b6e01279c92c916;p=coloredstderr%2Fcoloredstderr.git diff --git a/src/coloredstderr.c b/src/coloredstderr.c index 68ef859..eae164d 100644 --- a/src/coloredstderr.c +++ b/src/coloredstderr.c @@ -20,6 +20,8 @@ #include +#include "compiler.h" + /* Must be loaded before the following headers. */ #include "ldpreload.h" @@ -51,7 +53,7 @@ static int force_write_to_non_tty; #include "constants.h" -#ifdef DEBUG +#ifdef WARNING # include "debug.h" #endif @@ -60,34 +62,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 +105,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(); } @@ -126,7 +122,7 @@ static size_t post_string_size; /* Load alternative pre/post strings from the environment if available, fall * back to default values. */ -inline static void init_pre_post_string(void) { +static void init_pre_post_string(void) { pre_string = getenv(ENV_NAME_PRE_STRING); if (!pre_string) { pre_string = DEFAULT_PRE_STRING; @@ -140,38 +136,53 @@ inline static void init_pre_post_string(void) { post_string_size = strlen(post_string); } -static void handle_fd_pre(int fd, int action) { - (void)action; +/* Don't inline any of the pre/post functions. Keep the hook function as small + * as possible for speed reasons. */ +static void handle_fd_pre(int fd) noinline; +static void handle_fd_post(int fd) noinline; +static void handle_file_pre(FILE *stream) noinline; +static void handle_file_post(FILE *stream) noinline; + +static void handle_fd_pre(int fd) { + int saved_errno = errno; - if (!pre_string || !post_string) { + 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 action) { - (void)action; +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, int action) { - (void)action; +static void handle_file_pre(FILE *stream) { + int saved_errno = errno; - if (!pre_string || !post_string) { + 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 action) { - (void)action; +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; } @@ -225,8 +236,6 @@ HOOK_FILE2(int, putc_unlocked, stream, int, c, FILE *, stream) HOOK_FILE1(int, putchar_unlocked, stdout, int, c) -HOOK_FILE1(int, puts_unlocked, stdout, - char const *, s) /* perror(3) */ HOOK_VOID1(void, perror, STDERR_FILENO, @@ -234,9 +243,9 @@ HOOK_VOID1(void, perror, STDERR_FILENO, /* error(3) */ #ifdef HAVE_ERROR_H -static void error_vararg(int status, int errnum, - char const *filename, unsigned int linenum, - char const *format, va_list ap) { +static void error_vararg(int status, int errnum, + char const *filename, unsigned int linenum, + char const *format, va_list ap) { static char const *last_filename; static unsigned int last_linenum; @@ -313,9 +322,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; @@ -325,9 +332,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; @@ -337,9 +342,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; @@ -371,9 +374,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;