projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move more file stuff to file.h
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 0ef039ddb03feef70c7976cf4438200a0c5f4ca3..8c1502ec80319775240d3300b2b565eba718a562 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-37,6
+37,7
@@
#include "fio.h"
#include "hash.h"
#include "smalloc.h"
#include "fio.h"
#include "hash.h"
#include "smalloc.h"
+#include "verify.h"
unsigned long page_mask;
unsigned long page_size;
unsigned long page_mask;
unsigned long page_size;
@@
-52,6
+53,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;
@@
-171,13
+173,15
@@
static void set_sig_handlers(void)
static inline int should_check_rate(struct thread_data *td)
{
static inline int should_check_rate(struct thread_data *td)
{
+ struct thread_options *o = &td->o;
+
/*
/*
- *
No minimum rate set, always ok
+ *
If some rate setting was given, we need to check it
*/
*/
- if (
!td->o.ratemin && !td->o.
rate_iops_min)
- return
0
;
+ if (
o->rate || o->ratemin || o->rate_iops || o->
rate_iops_min)
+ return
1
;
- return
1
;
+ return
0
;
}
/*
}
/*
@@
-380,7
+384,7
@@
static void do_verify(struct thread_data *td)
* read from disk.
*/
for_each_file(td, f, i) {
* read from disk.
*/
for_each_file(td, f, i) {
- if (!
(f->flags & FIO_FILE_OPEN
))
+ if (!
fio_file_open(f
))
continue;
if (fio_io_sync(td, f))
break;
continue;
if (fio_io_sync(td, f))
break;
@@
-697,7
+701,7
@@
sync_done:
td_set_runstate(td, TD_FSYNCING);
for_each_file(td, f, i) {
td_set_runstate(td, TD_FSYNCING);
for_each_file(td, f, i) {
- if (!
(f->flags & FIO_FILE_OPEN
))
+ if (!
fio_file_open(f
))
continue;
fio_io_sync(td, f);
}
continue;
fio_io_sync(td, f);
}
@@
-731,7
+735,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;
@@
-759,10
+763,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);
@@
-874,6
+888,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)
@@
-895,24
+914,31
@@
void reset_all_stats(struct thread_data *td)
memcpy(&td->start, &tv, sizeof(tv));
}
memcpy(&td->start, &tv, sizeof(tv));
}
-static
int
clear_io_state(struct thread_data *td)
+static
void
clear_io_state(struct thread_data *td)
{
struct fio_file *f;
unsigned int i;
{
struct fio_file *f;
unsigned int i;
- int ret;
reset_io_counters(td);
close_files(td);
reset_io_counters(td);
close_files(td);
+ for_each_file(td, f, i)
+ fio_file_clear_done(f);
+}
- ret = 0;
- for_each_file(td, f, i) {
- f->flags &= ~FIO_FILE_DONE;
- ret = td_io_open_file(td, f);
- if (ret)
- break;
- }
+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;
}
return ret;
}
@@
-1001,14
+1027,16
@@
static void *thread_main(void *data)
if (td_io_init(td))
goto err;
if (td_io_init(td))
goto err;
- if (open_files(td))
- goto err;
-
if (init_random_map(td))
goto err;
if (td->o.exec_prerun) {
if (init_random_map(td))
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;
}
goto err;
}
@@
-1026,8
+1054,8
@@
static void *thread_main(void *data)
memcpy(&td->lastrate, &td->ts.stat_sample_time,
sizeof(td->lastrate));
memcpy(&td->lastrate, &td->ts.stat_sample_time,
sizeof(td->lastrate));
- if (clear_state
&& clear_io_state(td)
)
-
break
;
+ if (clear_state)
+
clear_io_state(td)
;
prune_io_piece_log(td);
prune_io_piece_log(td);
@@
-1062,8
+1090,7
@@
static void *thread_main(void *data)
(td->io_ops->flags & FIO_UNIDIR))
continue;
(td->io_ops->flags & FIO_UNIDIR))
continue;
- if (clear_io_state(td))
- break;
+ clear_io_state(td);
fio_gettime(&td->start, NULL);
fio_gettime(&td->start, NULL);
@@
-1082,6
+1109,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,
@@
-1092,7
+1120,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");
}
@@
-1103,10
+1131,9
@@
static void *thread_main(void *data)
} else
finish_log(td, td->ts.clat_log, "clat");
}
} 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);
if (exitall_on_terminate)
terminate_threads(td->groupid);
@@
-1550,6
+1577,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();
@@
-1567,5
+1595,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;
}