sheppy/colorredstderr-mirror
1
0
Fork 0
mirror of https://github.com/FAUSheppy/colorredstderr-mirror synced 2025-12-09 16:38:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Inline check_handle_fd() into hook macros.

Browse Source 
It's very small and prologue/epilogue have a lot of overhead.
This commit is contained in:
Simon Ruderich
2013-06-10 05:55:51 +02:00
parent c7f6f13de0
commit 9862b8c8f1
2 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/coloredstderr.c
View File

@@ -60,31 +60,8 @@ 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) {
return 1;
}
int saved_errno = errno;
int result = isatty(fd);
errno = saved_errno;
return result;
}
static void dup_fd(int oldfd, int newfd) {
#ifdef DEBUG

60
src/hookmacros.h
View File

@@ -22,24 +22,76 @@
/* Hook the function by creating a function with the same name. With
* LD_PRELOAD our function will be preferred. The original function is stored
* in a static variable (real_*). */
* in a static variable (real_*). Any function called in these macros must
* make sure to restore the errno if it changes it.
*
* "Pseudo code" for the following macros. <name> is the name of the hooked
* function, <fd> is either a file descriptor or a FILE pointer.
*
* if (!real_<name>) {
* real_<name> = dlsym_function(<name>);
* if (!initialized) {
* init_from_environment();
* }
* }
* if (tracked_fds_find(<fd>)) {
* if (force_write_to_non_tty) {
* handle = 1;
* } else {
* handle = isatty(<fd>);
* }
* } else {
* handle = 0;
* }
*
* if (handle) {
* handle_<fd>_pre(<fd>);
* }
* <type> result = real_<name>(<args>);
* if (handle) {
* handle_<fd>_post(<fd>);
* }
* return result;
*/
#define _HOOK_PRE(type, name) \
int handle; \
DLSYM_FUNCTION(real_ ## name, #name);
if (!(real_ ## name )) { \
*(void **) (&(real_ ## name)) = dlsym_function(#name); \
/* Initialize our data while we're at it. */ \
if (!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) \
handle = check_handle_fd(fd); \
if (tracked_fds_find(fd)) { \
if (force_write_to_non_tty) { \
handle = 1; \
} else { \
handle = isatty(fd); \
} \
} else { \
handle = 0; \
} \
if (handle) { \
handle_fd_pre(fd); \
}
#define _HOOK_PRE_FILE(type, name, file) \
type result; \
_HOOK_PRE(type, name) \
handle = check_handle_fd(fileno(file)); \
if (tracked_fds_find(fileno(file))) { \
if (force_write_to_non_tty) { \
handle = 1; \
} else { \
handle = isatty(fileno(file)); \
} \
} else { \
handle = 0; \
} \
if (handle) { \
handle_file_pre(file); \
}