X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=62fab49c17ea4be20e416344f90c9278333976f2;hp=ad2282d7516fe7fc0033b3bc721a12b16d370fe1;hb=ac89311241264280574c81e6400c9a0c59615082;hpb=9a153e6efa862c547abfc745fed2c27fce8daf20

diff --git a/fio.c b/fio.c
index ad2282d7..62fab49c 100644
--- a/fio.c
+++ b/fio.c
@@ -52,6 +52,7 @@ int temp_stall_ts;
 unsigned long done_secs = 0;
 
 static struct fio_mutex *startup_mutex;
+static struct fio_mutex *writeout_mutex;
 static volatile int fio_abort;
 static int exit_value;
 static struct itimerval itimer;
@@ -733,7 +734,7 @@ static int init_io_u(struct thread_data *td)
 {
 	struct io_u *io_u;
 	unsigned int max_bs;
-	int i, max_units;
+	int cl_align, i, max_units;
 	char *p;
 
 	max_units = td->o.iodepth;
@@ -761,10 +762,20 @@ static int init_io_u(struct thread_data *td)
 	else
 		p = td->orig_buffer;
 
+	cl_align = os_cache_line_size();
+
 	for (i = 0; i < max_units; i++) {
+		void *ptr;
+
 		if (td->terminate)
 			return 1;
-		io_u = malloc(sizeof(*io_u));
+
+		if (posix_memalign(&ptr, cl_align, sizeof(*io_u))) {
+			log_err("fio: posix_memalign=%s\n", strerror(errno));
+			break;
+		}
+
+		io_u = ptr;
 		memset(io_u, 0, sizeof(*io_u));
 		INIT_FLIST_HEAD(&io_u->list);
 
@@ -914,6 +925,22 @@ static void clear_io_state(struct thread_data *td)
 		f->flags &= ~FIO_FILE_DONE;
 }
 
+static int exec_string(const char *string)
+{
+	int ret, newlen = strlen(string) + 1 + 8;
+	char *str;
+
+	str = malloc(newlen);
+	sprintf(str, "sh -c %s", string);
+
+	ret = system(str);
+	if (ret == -1)
+		log_err("fio: exec of cmd <%s> failed\n", str);
+
+	free(str);
+	return ret;
+}
+
 /*
  * Entry point for the thread based jobs. The process based jobs end up
  * here as well, after a little setup.
@@ -1003,7 +1030,12 @@ static void *thread_main(void *data)
 		goto err;
 
 	if (td->o.exec_prerun) {
-		if (system(td->o.exec_prerun) < 0)
+		if (exec_string(td->o.exec_prerun))
+			goto err;
+	}
+
+	if (td->o.pre_read) {
+		if (pre_read_files(td) < 0)
 			goto err;
 	}
 
@@ -1076,6 +1108,7 @@ static void *thread_main(void *data)
 	td->ts.io_bytes[0] = td->io_bytes[0];
 	td->ts.io_bytes[1] = td->io_bytes[1];
 
+	fio_mutex_down(writeout_mutex);
 	if (td->ts.bw_log) {
 		if (td->o.bw_log_file) {
 			finish_log_named(td, td->ts.bw_log,
@@ -1086,7 +1119,7 @@ static void *thread_main(void *data)
 	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");
+						td->o.lat_log_file, "slat");
 		} else
 			finish_log(td, td->ts.slat_log, "slat");
 	}
@@ -1097,10 +1130,9 @@ static void *thread_main(void *data)
 		} else
 			finish_log(td, td->ts.clat_log, "clat");
 	}
-	if (td->o.exec_postrun) {
-		if (system(td->o.exec_postrun) < 0)
-			log_err("fio: postrun %s failed\n", td->o.exec_postrun);
-	}
+	fio_mutex_up(writeout_mutex);
+	if (td->o.exec_postrun)
+		exec_string(td->o.exec_postrun);
 
 	if (exitall_on_terminate)
 		terminate_threads(td->groupid);
@@ -1544,6 +1576,7 @@ int main(int argc, char *argv[])
 	}
 
 	startup_mutex = fio_mutex_init(0);
+	writeout_mutex = fio_mutex_init(1);
 
 	set_genesis_time();
 
@@ -1561,5 +1594,6 @@ int main(int argc, char *argv[])
 	}
 
 	fio_mutex_remove(startup_mutex);
+	fio_mutex_remove(writeout_mutex);
 	return exit_value;
 }