use file set per thread when redirecting stderr/out

Author: Cryptkeeper

src/fd.c

@@ -2,6 +2,7 @@
 /// @brief File descriptor output redirection implementation.
 #include "fd.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -28,6 +29,17 @@ static int openfd(const char* name, const unsigned int id) {
   return fno;
 }
 
+/// @brief Closes the file descriptor if open (indicated by a value of >=0) and
+/// sets it to -1.
+/// @param fd Pointer to the file descriptor to close, must not be NULL.
+static void closefd(int* fd) {
+  assert(fd != NULL);
+  if (*fd >= 0) {
+    close(*fd);
+    *fd = -1;
+  }
+}
+
 int fdinit(struct fdset_s* fds, const unsigned int id) {
   fds->out = fds->err = -1;
   if ((fds->out = openfd("stdout", id)) < 0) return -1;
@@ -39,12 +51,6 @@ int fdinit(struct fdset_s* fds, const unsigned int id) {
 }
 
 void fdclose(struct fdset_s* fds) {
-  if (fds->out >= 0) {
-    close(fds->out);
-    fds->out = -1;
-  }
-  if (fds->err >= 0) {
-    close(fds->err);
-    fds->err = -1;
-  }
+  closefd(&fds->out);
+  closefd(&fds->err);
 }

src/tp.c

@@ -69,11 +69,12 @@ static void* tpentrypoint(void* arg) {
 /// file descriptor set initialization fails, or the flag is not set, the file
 /// descriptors will default to \p STDOUT_FILENO and \p STDERR_FILENO.
 /// @param t The thread to configure
+/// @param uid The thread pool thread ID for logging
 /// @param flags The configuration flags
-static void tpinitthrd(struct thrd_s* t, const int flags) {
+static void tpinitthrd(struct thrd_s* t, const int uid, const int flags) {
   int err;
   if (flags & TPOPT_LOGFILES) {
-    if ((err = fdinit(&t->fds, 0))) {
+    if ((err = fdinit(&t->fds, uid))) {
       log_error("file descriptor set open error: %d", err);
     } else {
       t->fdsopen = true;
@@ -94,7 +95,7 @@ int tpinit(const int size, const int flags) {
   for (int i = 0; i < size; i++) {
     if ((thrds[i] = calloc(1, sizeof(struct thrd_s))) == NULL) goto fail;
     struct thrd_s* t = thrds[i];
-    tpinitthrd(t, flags);
+    tpinitthrd(t, i, flags);
     int err;
     if ((err = pthread_create(&t->tid, NULL, tpentrypoint, t))) {
       log_error("cannot create thread: %s", strerror(err));