return 0;
}
-static inline int is_power_of_2(unsigned int val)
-{
- return (val != 0 && ((val & (val - 1)) == 0));
-}
-
static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
{
const int ddir = io_u->ddir;
{
enum fio_ddir ddir;
+ /*
+ * see if it's time to fsync
+ */
+ if (td->o.fsync_blocks &&
+ !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
+ td->io_issues[DDIR_WRITE] && should_fsync(td))
+ return DDIR_SYNC;
+
+ /*
+ * see if it's time to fdatasync
+ */
+ if (td->o.fdatasync_blocks &&
+ !(td->io_issues[DDIR_WRITE] % td->o.fdatasync_blocks) &&
+ td->io_issues[DDIR_WRITE] && should_fsync(td))
+ return DDIR_DATASYNC;
+
if (td_rw(td)) {
/*
* Check if it's time to seed a new data direction.
return td->rwmix_ddir;
}
-static void put_file_log(struct thread_data *td, struct fio_file *f)
+void put_file_log(struct thread_data *td, struct fio_file *f)
{
int ret = put_file(td, f);
void put_io_u(struct thread_data *td, struct io_u *io_u)
{
+ td_io_u_lock(td);
+
assert((io_u->flags & IO_U_F_FREE) == 0);
io_u->flags |= IO_U_F_FREE;
+ io_u->flags &= ~IO_U_F_FREE_DEF;
if (io_u->file)
put_file_log(td, io_u->file);
io_u->file = NULL;
- flist_del(&io_u->list);
+ flist_del_init(&io_u->list);
flist_add(&io_u->list, &td->io_u_freelist);
td->cur_depth--;
+ td_io_u_unlock(td);
+ td_io_u_free_notify(td);
+}
+
+void clear_io_u(struct thread_data *td, struct io_u *io_u)
+{
+ io_u->flags &= ~IO_U_F_FLIGHT;
+ put_io_u(td, io_u);
}
void requeue_io_u(struct thread_data *td, struct io_u **io_u)
dprint(FD_IO, "requeue %p\n", __io_u);
+ td_io_u_lock(td);
+
__io_u->flags |= IO_U_F_FREE;
- if ((__io_u->flags & IO_U_F_FLIGHT) && (__io_u->ddir != DDIR_SYNC))
+ if ((__io_u->flags & IO_U_F_FLIGHT) && !ddir_sync(__io_u->ddir))
td->io_issues[__io_u->ddir]--;
__io_u->flags &= ~IO_U_F_FLIGHT;
flist_del(&__io_u->list);
flist_add_tail(&__io_u->list, &td->io_u_requeues);
td->cur_depth--;
+ td_io_u_unlock(td);
*io_u = NULL;
}
if (td->io_ops->flags & FIO_NOIO)
goto out;
+ io_u->ddir = get_rw_ddir(td);
+
/*
- * see if it's time to sync
+ * fsync() or fdatasync(), we are done
*/
- if (td->o.fsync_blocks &&
- !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
- td->io_issues[DDIR_WRITE] && should_fsync(td)) {
- io_u->ddir = DDIR_SYNC;
+ if (ddir_sync(io_u->ddir))
goto out;
- }
-
- io_u->ddir = get_rw_ddir(td);
/*
* See if it's time to switch to a new zone
/*
* Get next file to service by choosing one at random
*/
-static struct fio_file *get_next_file_rand(struct thread_data *td, enum fio_file_flags goodf,
+static struct fio_file *get_next_file_rand(struct thread_data *td,
+ enum fio_file_flags goodf,
enum fio_file_flags badf)
{
struct fio_file *f;
{
struct io_u *io_u = NULL;
+ td_io_u_lock(td);
+
+again:
if (!flist_empty(&td->io_u_requeues))
io_u = flist_entry(td->io_u_requeues.next, struct io_u, list);
else if (!queue_full(td)) {
io_u->end_io = NULL;
}
+ /*
+ * We ran out, wait for async verify threads to finish and return one
+ */
+ if (!io_u && td->o.verify_async) {
+ pthread_cond_wait(&td->free_cond, &td->io_u_lock);
+ goto again;
+ }
+
if (io_u) {
assert(io_u->flags & IO_U_F_FREE);
io_u->flags &= ~IO_U_F_FREE;
+ io_u->flags &= ~IO_U_F_FREE_DEF;
io_u->error = 0;
flist_del(&io_u->list);
td->cur_depth++;
}
+ td_io_u_unlock(td);
return io_u;
}
f = io_u->file;
assert(fio_file_open(f));
- if (io_u->ddir != DDIR_SYNC) {
+ if (!ddir_sync(io_u->ddir)) {
if (!io_u->buflen && !(td->io_ops->flags & FIO_NOIO)) {
dprint(FD_IO, "get_io_u: zero buflen on %p\n", io_u);
goto err_put;
assert(io_u->flags & IO_U_F_FLIGHT);
io_u->flags &= ~IO_U_F_FLIGHT;
- if (io_u->ddir == DDIR_SYNC) {
+ if (ddir_sync(io_u->ddir)) {
td->last_was_sync = 1;
return;
}
td->this_io_bytes[idx] += bytes;
if (ramp_time_over(td)) {
- if (!td->o.disable_clat || !td->o.disable_bw ||
- __should_check_rate(td, idx))
- usec = utime_since(&io_u->issue_time,
+ unsigned long uninitialized_var(lusec);
+ unsigned long uninitialized_var(rusec);
+
+ if (!td->o.disable_clat || !td->o.disable_bw)
+ lusec = utime_since(&io_u->issue_time,
+ &icd->time);
+ if (__should_check_rate(td, idx) ||
+ __should_check_rate(td, idx ^ 1))
+ rusec = utime_since(&io_u->start_time,
&icd->time);
if (!td->o.disable_clat) {
add_clat_sample(td, idx, usec, bytes);
- io_u_mark_latency(td, usec);
+ io_u_mark_latency(td, lusec);
}
if (!td->o.disable_bw)
add_bw_sample(td, idx, bytes, &icd->time);
- if (__should_check_rate(td, idx))
- td->rate_pending_usleep[idx] += (long) td->rate_usec_cycle[idx] - usec;
+ if (__should_check_rate(td, idx)) {
+ td->rate_pending_usleep[idx] +=
+ (long) td->rate_usec_cycle[idx] - rusec;
+ }
if (__should_check_rate(td, idx ^ 1))
- td->rate_pending_usleep[idx ^ 1] -= usec;
+ td->rate_pending_usleep[idx ^ 1] -= rusec;
}
if (td_write(td) && idx == DDIR_WRITE &&
icd->error = io_u->error;
io_u_log_error(td, io_u);
}
+ if (td->o.continue_on_error && icd->error &&
+ td_non_fatal_error(icd->error)) {
+ /*
+ * If there is a non_fatal error, then add to the error count
+ * and clear all the errors.
+ */
+ update_error_count(td, icd->error);
+ td_clear_error(td);
+ icd->error = 0;
+ io_u->error = 0;
+ }
}
static void init_icd(struct thread_data *td, struct io_completion_data *icd,
io_u = td->io_ops->event(td, i);
io_completed(td, io_u, icd);
- put_io_u(td, io_u);
+
+ if (!(io_u->flags & IO_U_F_FREE_DEF))
+ put_io_u(td, io_u);
}
}
init_icd(td, &icd, 1);
io_completed(td, io_u, &icd);
- put_io_u(td, io_u);
+
+ if (!(io_u->flags & IO_U_F_FREE_DEF))
+ put_io_u(td, io_u);
if (icd.error) {
td_verror(td, icd.error, "io_u_sync_complete");
unsigned long slat_time;
slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
- add_slat_sample(td, io_u->ddir, io_u->xfer_buflen, slat_time);
+ add_slat_sample(td, io_u->ddir, slat_time, io_u->xfer_buflen);
}
}