Make sure os mutex define is visible in mutex.c

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index a58effcf3394816b20d04937de81f77f1a0c179f..30b40cc7e27d8be1e9940695ed2c36c92bba2c46 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -673,7 +673,7 @@ sync_done:
                                int left;
 
                                if (td->o.thinktime_spin)
-                                       __usec_sleep(td->o.thinktime_spin);
+                                       usec_spin(td->o.thinktime_spin);
 
                                left = td->o.thinktime - td->o.thinktime_spin;
                                if (left)
@@ -965,11 +965,11 @@ static void *thread_main(void *data)
                goto err;
        }
 
+       /*
+        * If we have a gettimeofday() thread, make sure we exclude that
+        * thread from this job
+        */
        if (td->o.gtod_cpu) {
-               if (fio_getaffinity(td->pid, &td->o.cpumask) == -1) {
-                       td_verror(td, errno, "cpu_get_affinity");
-                       goto err;
-               }
                fio_cpu_clear(&td->o.cpumask, td->o.gtod_cpu);
                if (fio_setaffinity(td) == -1) {
                        td_verror(td, errno, "cpu_set_affinity");
@@ -1080,21 +1080,24 @@ static void *thread_main(void *data)
        td->ts.io_bytes[1] = td->io_bytes[1];
 
        if (td->ts.bw_log) {
-               if (td->o.bw_log_file)
-                       finish_log_named(td, td->ts.bw_log, td->o.bw_log_file, "bw");
-               else
+               if (td->o.bw_log_file) {
+                       finish_log_named(td, td->ts.bw_log,
+                                               td->o.bw_log_file, "bw");
+               } else
                        finish_log(td, td->ts.bw_log, "bw");
        }
        if (td->ts.slat_log) {
-               if (td->o.lat_log_file)
-                       finish_log_named(td, td->ts.slat_log, td->o.lat_log_file, "clat");
-               else
+               if (td->o.lat_log_file) {
+                       finish_log_named(td, td->ts.slat_log,
+                                               td->o.lat_log_file, "clat");
+               } else
                        finish_log(td, td->ts.slat_log, "slat");
        }
        if (td->ts.clat_log) {
-               if (td->o.lat_log_file)
-                       finish_log_named(td, td->ts.clat_log, td->o.lat_log_file, "clat");
-               else
+               if (td->o.lat_log_file) {
+                       finish_log_named(td, td->ts.clat_log,
+                                               td->o.lat_log_file, "clat");
+               } else
                        finish_log(td, td->ts.clat_log, "clat");
        }
        if (td->o.exec_postrun) {
@@ -1113,6 +1116,12 @@ err:
        close_ioengine(td);
        cleanup_io_u(td);
 
+       if (td->o.cpumask_set) {
+               int ret = fio_cpuset_exit(&td->o.cpumask);
+
+               td_verror(td, ret, "fio_cpuset_exit");
+       }
+
        /*
         * do this very late, it will log file closing as well
         */