Fix printf() being used instead of log_info()

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index b242f9445cb872c14c0ec008cba1f257dd4f53f1..3f6a586b79143adcac8726c4a33697e9c6a63837 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -55,13 +55,20 @@ unsigned long page_size;
        (char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
 
 int groupid = 0;
-int thread_number = 0;
-int nr_process = 0;
-int nr_thread = 0;
+unsigned int thread_number = 0;
+unsigned int nr_process = 0;
+unsigned int nr_thread = 0;
 int shm_id = 0;
 int temp_stall_ts;
 unsigned long done_secs = 0;
 
+/*
+ * Just expose an empty list, if the OS does not support disk util stats
+ */
+#ifndef FIO_HAVE_DISK_UTIL
+FLIST_HEAD(disk_list);
+#endif
+
 static struct fio_mutex *startup_mutex;
 static struct fio_mutex *writeout_mutex;
 static volatile int fio_abort;
@@ -1354,7 +1361,6 @@ err:
        if (td->o.write_iolog_file)
                write_iolog_close(td);
 
-       options_mem_free(td);
        td_set_runstate(td, TD_EXITED);
        return (void *) (unsigned long) td->error;
 }
@@ -1392,10 +1398,12 @@ static int fork_main(int shmid, int offset)
 /*
  * Run over the job map and reap the threads that have exited, if any.
  */
-static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
+static void reap_threads(unsigned int *nr_running, unsigned int *t_rate,
+                        unsigned int *m_rate)
 {
        struct thread_data *td;
-       int i, cputhreads, realthreads, pending, status, ret;
+       unsigned int cputhreads, realthreads, pending;
+       int i, status, ret;
 
        /*
         * reap exited threads (TD_EXITED -> TD_REAPED)
@@ -1535,7 +1543,7 @@ static void run_threads(void)
 {
        struct thread_data *td;
        unsigned long spent;
-       int i, todo, nr_running, m_rate, t_rate, nr_started;
+       unsigned int i, todo, nr_running, m_rate, t_rate, nr_started;
 
        if (fio_pin_memory())
                return;
@@ -1552,7 +1560,7 @@ static void run_threads(void)
                                                nr_thread > 1 ? "s" : "");
                if (nr_process) {
                        if (nr_thread)
-                               printf(" and ");
+                               log_info(" and ");
                        log_info("%d process%s", nr_process,
                                                nr_process > 1 ? "es" : "");
                }
@@ -1766,11 +1774,17 @@ static void run_threads(void)
 
 int exec_run(void)
 {
+       struct thread_data *td;
+       int i;
+
        if (nr_clients)
                return fio_handle_clients();
-       if (exec_profile && load_profile(exec_profile))
-               return 1;
-
+       if (exec_profile) {
+               if (load_profile(exec_profile))
+                       return 1;
+               free(exec_profile);
+               exec_profile = NULL;
+       }
        if (!thread_number)
                return 0;
 
@@ -1803,6 +1817,9 @@ int exec_run(void)
                }
        }
 
+       for_each_td(td, i)
+               fio_options_free(td);
+
        cgroup_kill(cgroup_list);
        sfree(cgroup_list);
        sfree(cgroup_mnt);