X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Ftrackfds.h;h=175f1e387d17fd9672c5bc066c088018bd32f8ab;hb=0a2617527c9b46a587a8f34571a54347cd5c4b5a;hp=4571b2c9448fdc9d19aded63e222a10c8511c2e3;hpb=c2097785e752fee94c5c9ef46f03b8312694251a;p=coloredstderr%2Fcoloredstderr.git

diff --git a/src/trackfds.h b/src/trackfds.h
index 4571b2c..175f1e3 100644
--- a/src/trackfds.h
+++ b/src/trackfds.h
@@ -76,7 +76,9 @@ static void init_from_environment(void) {
 #ifdef DEBUG
     debug("init_from_environment()\t\t[%d]\n", getpid());
 #endif
-    const char *env;
+    char const *env;
+
+    int saved_errno = errno;
 
     initialized = 1;
     tracked_fds_list_count = 0;
@@ -90,6 +92,7 @@ static void init_from_environment(void) {
 
     env = getenv(ENV_NAME_FDS);
     if (!env) {
+        errno = saved_errno;
         return;
     }
     /* Environment is read-only. */
@@ -135,7 +138,6 @@ static void init_from_environment(void) {
                  * elements doesn't hurt. */
                 if (!init_tracked_fds_list(count)) {
                     /* Couldn't allocate memory, skip this entry. */
-                    warning("foo\n");
                     goto next;
                 }
             }
@@ -154,6 +156,8 @@ next:
 #ifdef DEBUG
     tracked_fds_debug();
 #endif
+
+    errno = saved_errno;
 }
 
 static char *update_environment_buffer_entry(char *x, int fd) {
@@ -232,6 +236,8 @@ static void tracked_fds_add(int fd) {
     }
 
     if (tracked_fds_list_count >= tracked_fds_list_space) {
+        int saved_errno = errno;
+
         size_t new_space = tracked_fds_list_space + TRACKFDS_REALLOC_STEP;
         int *tmp = realloc(tracked_fds_list,
                            sizeof(*tracked_fds_list) * new_space);
@@ -243,8 +249,11 @@ static void tracked_fds_add(int fd) {
             warning("realloc(tracked_fds_list, %zu) failed! [%d]\n",
                     sizeof(*tracked_fds_list) * new_space, getpid());
 #endif
+            errno = saved_errno;
             return;
         }
+        errno = saved_errno;
+
         tracked_fds_list = tmp;
         tracked_fds_list_space = new_space;
     }
@@ -290,10 +299,25 @@ static int tracked_fds_remove(int fd) {
     /* Not found. */
     return 0;
 }
+
+static int tracked_fds_find_slow(int fd);
+/*
+ * tracked_fds_find() is called for each hook call and should be as fast as
+ * possible. As most file descriptors are < TRACKFDS_STATIC_COUNT, force the
+ * compiler to inline that part which is almost exclusively used.
+ *
+ * Inlining tracked_fds_add()/tracked_fds_remove() isn't worth the effort as
+ * they are not called often enough.
+ */
+inline static int tracked_fds_find(int fd) __always_inline;
 static int tracked_fds_find(int fd) {
     if (fd < TRACKFDS_STATIC_COUNT) {
         return tracked_fds[fd];
     }
+
+    return tracked_fds_find_slow(fd);
+}
+static int tracked_fds_find_slow(int fd) {
     if (tracked_fds_list_count == 0) {
         return 0;
     }