projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add appropriate warning in mmap engine for large maps failing
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index f699951dcf58697f87922be056bfe99191e82f96..4a02f2ebee198584e477f5e6b8749447c6f94463 100644
(file)
--- 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;
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;
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;
{
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;
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;
else
p = td->orig_buffer;
+ cl_align = os_cache_line_size();
+
for (i = 0; i < max_units; i++) {
for (i = 0; i < max_units; i++) {
+ void *ptr;
+
if (td->terminate)
return 1;
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);
memset(io_u, 0, sizeof(*io_u));
INIT_FLIST_HEAD(&io_u->list);
@@
-876,6
+887,11
@@
static void reset_io_counters(struct thread_data *td)
*/
if (td->o.time_based || td->o.loops)
td->nr_done_files = 0;
*/
if (td->o.time_based || td->o.loops)
td->nr_done_files = 0;
+
+ /*
+ * Set the same seed to get repeatable runs
+ */
+ td_fill_rand_seeds(td);
}
void reset_all_stats(struct thread_data *td)
}
void reset_all_stats(struct thread_data *td)
@@
-1071,6
+1087,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];
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,
if (td->ts.bw_log) {
if (td->o.bw_log_file) {
finish_log_named(td, td->ts.bw_log,
@@
-1081,7
+1098,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,
if (td->ts.slat_log) {
if (td->o.lat_log_file) {
finish_log_named(td, td->ts.slat_log,
- td->o.lat_log_file, "
c
lat");
+ td->o.lat_log_file, "
s
lat");
} else
finish_log(td, td->ts.slat_log, "slat");
}
} else
finish_log(td, td->ts.slat_log, "slat");
}
@@
-1092,6
+1109,7
@@
static void *thread_main(void *data)
} else
finish_log(td, td->ts.clat_log, "clat");
}
} else
finish_log(td, td->ts.clat_log, "clat");
}
+ fio_mutex_up(writeout_mutex);
if (td->o.exec_postrun) {
if (system(td->o.exec_postrun) < 0)
log_err("fio: postrun %s failed\n", td->o.exec_postrun);
if (td->o.exec_postrun) {
if (system(td->o.exec_postrun) < 0)
log_err("fio: postrun %s failed\n", td->o.exec_postrun);
@@
-1539,6
+1557,7
@@
int main(int argc, char *argv[])
}
startup_mutex = fio_mutex_init(0);
}
startup_mutex = fio_mutex_init(0);
+ writeout_mutex = fio_mutex_init(1);
set_genesis_time();
set_genesis_time();
@@
-1556,5
+1575,6
@@
int main(int argc, char *argv[])
}
fio_mutex_remove(startup_mutex);
}
fio_mutex_remove(startup_mutex);
+ fio_mutex_remove(writeout_mutex);
return exit_value;
}
return exit_value;
}