fio: Simplify forking of processes

[fio.git] / backend.c

diff --git a/backend.c b/backend.c
index efedb5329d65a9bc224047ffe43027ca21f290f1..ce23c6960f0304ea6a1eaef56efdbd3545dc76f5 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -441,6 +441,12 @@ static int wait_for_completions(struct thread_data *td, struct timeval *time)
        int min_evts = 0;
        int ret;
 
+       if (td->flags & TD_F_REGROW_LOGS) {
+               ret = io_u_quiesce(td);
+               regrow_logs(td);
+               return ret;
+       }
+
        /*
         * if the queue is full, we MUST reap at least 1 event
         */
@@ -518,6 +524,9 @@ sync_done:
                                break;
                }
 
+               if (td->flags & TD_F_REGROW_LOGS)
+                       regrow_logs(td);
+
                /*
                 * when doing I/O (not when verifying),
                 * check for any errors that are to be ignored
@@ -1471,6 +1480,14 @@ static void *thread_main(void *data)
                goto err;
        }
 
+       /*
+        * Do this early, we don't want the compress threads to be limited
+        * to the same CPUs as the IO workers. So do this before we set
+        * any potential CPU affinity
+        */
+       if (iolog_compress_init(td, sk_out))
+               goto err;
+
        /*
         * If we have a gettimeofday() thread, make sure we exclude that
         * thread from this job
@@ -1605,9 +1622,6 @@ static void *thread_main(void *data)
                        goto err;
        }
 
-       if (iolog_compress_init(td, sk_out))
-               goto err;
-
        fio_verify_init(td);
 
        if (rate_submit_init(td, sk_out))
@@ -1705,6 +1719,8 @@ static void *thread_main(void *data)
                        break;
        }
 
+       td_set_runstate(td, TD_FINISHING);
+
        update_rusage_stat(td);
        td->ts.total_run_time = mtime_since_now(&td->epoch);
        td->ts.io_bytes[DDIR_READ] = td->io_bytes[DDIR_READ];
@@ -1778,43 +1794,11 @@ err:
        return (void *) (uintptr_t) td->error;
 }
 
-
-/*
- * We cannot pass the td data into a forked process, so attach the td and
- * pass it to the thread worker.
- */
-static int fork_main(struct sk_out *sk_out, int shmid, int offset)
-{
-       struct fork_data *fd;
-       void *data, *ret;
-
-#if !defined(__hpux) && !defined(CONFIG_NO_SHM)
-       data = shmat(shmid, NULL, 0);
-       if (data == (void *) -1) {
-               int __err = errno;
-
-               perror("shmat");
-               return __err;
-       }
-#else
-       /*
-        * HP-UX inherits shm mappings?
-        */
-       data = threads;
-#endif
-
-       fd = calloc(1, sizeof(*fd));
-       fd->td = data + offset * sizeof(struct thread_data);
-       fd->sk_out = sk_out;
-       ret = thread_main(fd);
-       shmdt(data);
-       return (int) (uintptr_t) ret;
-}
-
 static void dump_td_info(struct thread_data *td)
 {
-       log_err("fio: job '%s' hasn't exited in %lu seconds, it appears to "
-               "be stuck. Doing forceful exit of this job.\n", td->o.name,
+       log_err("fio: job '%s' (state=%d) hasn't exited in %lu seconds, it "
+               "appears to be stuck. Doing forceful exit of this job.\n",
+                       td->o.name, td->runstate,
                        (unsigned long) time_since_now(&td->terminate_time));
 }
 
@@ -2147,6 +2131,7 @@ reap:
                struct thread_data *map[REAL_MAX_JOBS];
                struct timeval this_start;
                int this_jobs = 0, left;
+               struct fork_data *fd;
 
                /*
                 * create threads (TD_NOT_CREATED -> TD_CREATED)
@@ -2196,14 +2181,13 @@ reap:
                        map[this_jobs++] = td;
                        nr_started++;
 
+                       fd = calloc(1, sizeof(*fd));
+                       fd->td = td;
+                       fd->sk_out = sk_out;
+
                        if (td->o.use_thread) {
-                               struct fork_data *fd;
                                int ret;
 
-                               fd = calloc(1, sizeof(*fd));
-                               fd->td = td;
-                               fd->sk_out = sk_out;
-
                                dprint(FD_PROCESS, "will pthread_create\n");
                                ret = pthread_create(&td->thread, NULL,
                                                        thread_main, fd);
@@ -2223,8 +2207,9 @@ reap:
                                dprint(FD_PROCESS, "will fork\n");
                                pid = fork();
                                if (!pid) {
-                                       int ret = fork_main(sk_out, shm_id, i);
+                                       int ret;
 
+                                       ret = (int)(uintptr_t)thread_main(fd);
                                        _exit(ret);
                                } else if (i == fio_debug_jobno)
                                        *fio_debug_jobp = pid;