Add another debug() print to init_from_environment().

[coloredstderr/coloredstderr.git] / src / trackfds.h

diff --git a/src/trackfds.h b/src/trackfds.h
index 4571b2c9448fdc9d19aded63e222a10c8511c2e3..f84e20daee373c405c9b95642e4306232123245a 100644 (file)
--- a/src/trackfds.h
+++ b/src/trackfds.h
@@ -56,7 +56,7 @@ static int init_tracked_fds_list(size_t count) {
 
     tracked_fds_list = malloc(count * sizeof(*tracked_fds_list));
     if (!tracked_fds_list) {
-#ifdef DEBUG
+#ifdef WARNING
         warning("malloc(tracked_fds_list, %d) failed [%d]\n",
                 count * sizeof(*tracked_fds_list), getpid());
 #endif
@@ -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,8 +92,12 @@ static void init_from_environment(void) {
 
     env = getenv(ENV_NAME_FDS);
     if (!env) {
+        errno = saved_errno;
         return;
     }
+#ifdef DEBUG
+    debug("  getenv(\"%s\"): \"%s\"\n", ENV_NAME_FDS, env);
+#endif
     /* Environment is read-only. */
     char env_copy[strlen(env) + 1];
     strcpy(env_copy, env);
@@ -135,7 +141,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,13 +159,15 @@ next:
 #ifdef DEBUG
     tracked_fds_debug();
 #endif
+
+    errno = saved_errno;
 }
 
 static char *update_environment_buffer_entry(char *x, int fd) {
     int length = snprintf(x, 10 + 1, "%d", fd);
     if (length >= 10 + 1) {
         /* Integer too big to fit the buffer, skip it. */
-#ifdef DEBUG
+#ifdef WARNING
         warning("update_environment_buffer_entry(): truncated fd: %d [%d]\n",
                 fd, getpid());
 #endif
@@ -213,7 +220,7 @@ static void update_environment(void) {
     update_environment_buffer(env);
 
 #if 0
-    debug("    setenv('%s', '%s', 1)\n", ENV_NAME_FDS, env);
+    debug("    setenv(\"%s\", \"%s\", 1)\n", ENV_NAME_FDS, env);
 #endif
 
     setenv(ENV_NAME_FDS, env, 1 /* overwrite */);
@@ -232,6 +239,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);
@@ -239,12 +248,15 @@ static void tracked_fds_add(int fd) {
             /* We can do nothing, just ignore the error. We made sure not to
              * destroy our state, so the new descriptor is ignored without any
              * other consequences. */
-#ifdef DEBUG
+#ifdef WARNING
             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 +302,25 @@ static int tracked_fds_remove(int fd) {
     /* Not found. */
     return 0;
 }
+
+static int tracked_fds_find_slow(int fd) noinline;
+/*
+ * 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;
     }