projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add blockalign/ba option
[fio.git]
/
fio.c
diff --git
a/fio.c
b/fio.c
index 3944ce7349d89d77d3cc2b28dcd6f94a57dbe7ff..f699951dcf58697f87922be056bfe99191e82f96 100644
(file)
--- a/
fio.c
+++ b/
fio.c
@@
-171,13
+171,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
;
}
/*
}
/*
@@
-673,7
+675,7
@@
sync_done:
int left;
if (td->o.thinktime_spin)
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)
left = td->o.thinktime - td->o.thinktime_spin;
if (left)
@@
-895,25
+897,16
@@
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);
-
- ret = 0;
- for_each_file(td, f, i) {
+ for_each_file(td, f, i)
f->flags &= ~FIO_FILE_DONE;
f->flags &= ~FIO_FILE_DONE;
- ret = td_io_open_file(td, f);
- if (ret)
- break;
- }
-
- return ret;
}
/*
}
/*
@@
-941,8
+934,11
@@
static void *thread_main(void *data)
td->io_hist_tree = RB_ROOT;
td_set_runstate(td, TD_INITIALIZED);
td->io_hist_tree = RB_ROOT;
td_set_runstate(td, TD_INITIALIZED);
+ dprint(FD_MUTEX, "up startup_mutex\n");
fio_mutex_up(startup_mutex);
fio_mutex_up(startup_mutex);
+ dprint(FD_MUTEX, "wait on td->mutex\n");
fio_mutex_down(td->mutex);
fio_mutex_down(td->mutex);
+ dprint(FD_MUTEX, "done waiting on td->mutex\n");
/*
* the ->mutex mutex is now no longer used, close it to avoid
/*
* the ->mutex mutex is now no longer used, close it to avoid
@@
-970,10
+966,6
@@
static void *thread_main(void *data)
* thread from this job
*/
if (td->o.gtod_cpu) {
* 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");
fio_cpu_clear(&td->o.cpumask, td->o.gtod_cpu);
if (fio_setaffinity(td) == -1) {
td_verror(td, errno, "cpu_set_affinity");
@@
-1002,9
+994,6
@@
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 (init_random_map(td))
goto err;
@@
-1027,8
+1016,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);
@@
-1063,8
+1052,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);
@@
-1120,6
+1108,12
@@
err:
close_ioengine(td);
cleanup_io_u(td);
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
*/
/*
* do this very late, it will log file closing as well
*/
@@
-1269,16
+1263,23
@@
static void *gtod_thread_main(void *data)
static int fio_start_gtod_thread(void)
{
static int fio_start_gtod_thread(void)
{
- if (pthread_create(>od_thread, NULL, gtod_thread_main, NULL)) {
- perror("Can't create gtod thread");
+ int ret;
+
+ ret = pthread_create(>od_thread, NULL, gtod_thread_main, NULL);
+ if (ret) {
+ log_err("Can't create gtod thread: %s\n", strerror(ret));
return 1;
}
return 1;
}
- if (pthread_detach(gtod_thread) < 0) {
- perror("Can't detatch gtod thread");
+
+ ret = pthread_detach(gtod_thread);
+ if (ret) {
+ log_err("Can't detatch gtod thread: %s\n", strerror(ret));
return 1;
}
return 1;
}
+ dprint(FD_MUTEX, "wait on startup_mutex\n");
fio_mutex_down(startup_mutex);
fio_mutex_down(startup_mutex);
+ dprint(FD_MUTEX, "done waiting on startup_mutex\n");
return 0;
}
return 0;
}
@@
-1400,15
+1401,21
@@
static void run_threads(void)
nr_started++;
if (td->o.use_thread) {
nr_started++;
if (td->o.use_thread) {
+ int ret;
+
dprint(FD_PROCESS, "will pthread_create\n");
dprint(FD_PROCESS, "will pthread_create\n");
- if (pthread_create(&td->thread, NULL,
- thread_main, td)) {
- perror("pthread_create");
+ ret = pthread_create(&td->thread, NULL,
+ thread_main, td);
+ if (ret) {
+ log_err("pthread_create: %s\n",
+ strerror(ret));
nr_started--;
break;
}
nr_started--;
break;
}
- if (pthread_detach(td->thread) < 0)
- perror("pthread_detach");
+ ret = pthread_detach(td->thread);
+ if (ret)
+ log_err("pthread_detach: %s",
+ strerror(ret));
} else {
pid_t pid;
dprint(FD_PROCESS, "will fork\n");
} else {
pid_t pid;
dprint(FD_PROCESS, "will fork\n");
@@
-1420,7
+1427,9
@@
static void run_threads(void)
} else if (i == fio_debug_jobno)
*fio_debug_jobp = pid;
}
} else if (i == fio_debug_jobno)
*fio_debug_jobp = pid;
}
+ dprint(FD_MUTEX, "wait on startup_mutex\n");
fio_mutex_down(startup_mutex);
fio_mutex_down(startup_mutex);
+ dprint(FD_MUTEX, "done waiting on startup_mutex\n");
}
/*
}
/*