Add close_files() that closes all files

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index fcd15286a95b971692b5ca65af9de34e2bfd5662..c609f55d8e9520672e8c1e67e8c7b811dbceb002 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -49,7 +49,7 @@ int nr_thread = 0;
 int shm_id = 0;
 int temp_stall_ts;
 
-static struct fio_sem *startup_sem;
+static struct fio_mutex *startup_mutex;
 static volatile int fio_abort;
 static int exit_value;
 
@@ -73,13 +73,21 @@ static void terminate_threads(int group_id)
        for_each_td(td, i) {
                if (group_id == TERMINATE_ALL || groupid == td->groupid) {
                        dprint(FD_PROCESS, "setting terminate on %d\n",td->pid);
+
+                       td->terminate = 1;
+                       td->o.start_delay = 0;
+
                        /*
                         * if the thread is running, just let it exit
                         */
                        if (td->runstate < TD_RUNNING)
                                kill(td->pid, SIGQUIT);
-                       td->terminate = 1;
-                       td->o.start_delay = 0;
+                       else {
+                               struct ioengine_ops *ops = td->io_ops;
+
+                               if (ops && (ops->flags & FIO_SIGQUIT))
+                                       kill(td->pid, SIGQUIT);
+                       }
                }
        }
 }
@@ -779,8 +787,7 @@ static int clear_io_state(struct thread_data *td)
        if (td->o.time_based || td->o.loops)
                td->nr_done_files = 0;
 
-       for_each_file(td, f, i)
-               td_io_close_file(td, f);
+       close_files(td);
 
        ret = 0;
        for_each_file(td, f, i) {
@@ -818,14 +825,14 @@ static void *thread_main(void *data)
        td->io_hist_tree = RB_ROOT;
 
        td_set_runstate(td, TD_INITIALIZED);
-       fio_sem_up(startup_sem);
-       fio_sem_down(td->mutex);
+       fio_mutex_up(startup_mutex);
+       fio_mutex_down(td->mutex);
 
        /*
-        * the ->mutex semaphore is now no longer used, close it to avoid
+        * the ->mutex mutex is now no longer used, close it to avoid
         * eating a file descriptor
         */
-       fio_sem_remove(td->mutex);
+       fio_mutex_remove(td->mutex);
 
        /*
         * May alter parameters that init_io_u() will use, so we need to
@@ -958,7 +965,7 @@ static void *thread_main(void *data)
 err:
        if (td->error)
                printf("fio: pid=%d, err=%d/%s\n", td->pid, td->error, td->verror);
-       close_files(td);
+       close_and_free_files(td);
        close_ioengine(td);
        cleanup_io_u(td);
 
@@ -1020,7 +1027,11 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
                else
                        realthreads++;
 
-               if (!td->pid || td->runstate == TD_REAPED)
+               if (!td->pid) {
+                       pending++;
+                       continue;
+               }
+               if (td->runstate == TD_REAPED)
                        continue;
                if (td->o.use_thread) {
                        if (td->runstate == TD_EXITED) {
@@ -1205,7 +1216,7 @@ static void run_threads(void)
                                        exit(ret);
                                }
                        }
-                       fio_sem_down(startup_sem);
+                       fio_mutex_down(startup_mutex);
                }
 
                /*
@@ -1260,7 +1271,7 @@ static void run_threads(void)
                        m_rate += td->o.ratemin;
                        t_rate += td->o.rate;
                        todo--;
-                       fio_sem_up(td->mutex);
+                       fio_mutex_up(td->mutex);
                }
 
                reap_threads(&nr_running, &t_rate, &m_rate);
@@ -1309,7 +1320,7 @@ int main(int argc, char *argv[])
                setup_log(&agg_io_log[DDIR_WRITE]);
        }
 
-       startup_sem = fio_sem_init(0);
+       startup_mutex = fio_mutex_init(0);
 
        set_genesis_time();
 
@@ -1325,6 +1336,6 @@ int main(int argc, char *argv[])
                }
        }
 
-       fio_sem_remove(startup_sem);
+       fio_mutex_remove(startup_mutex);
        return exit_value;
 }