projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gfio: add error option group
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 7e05ff972c379b660316545f285a8bd5d024655f..a4802fec66ead13be34fe7c6bc0429978f695497 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-15,7
+15,7
@@
struct io_completion_data {
int nr; /* input */
int error; /* output */
int nr; /* input */
int error; /* output */
- unsigned long bytes_done[
2];
/* output */
+ unsigned long bytes_done[
DDIR_RWDIR_CNT];
/* output */
struct timeval time; /* output */
};
struct timeval time; /* output */
};
@@
-256,7
+256,7
@@
static int get_next_seq_offset(struct thread_data *td, struct fio_file *f,
{
assert(ddir_rw(ddir));
{
assert(ddir_rw(ddir));
- if (f->last_pos >= f->io_size && td->o.time_based)
+ if (f->last_pos >= f->io_size
+ get_start_offset(td)
&& td->o.time_based)
f->last_pos = f->last_pos - f->io_size;
if (f->last_pos < f->real_file_size) {
f->last_pos = f->last_pos - f->io_size;
if (f->last_pos < f->real_file_size) {
@@
-377,7
+377,7
@@
static inline int io_u_fits(struct thread_data *td, struct io_u *io_u,
{
struct fio_file *f = io_u->file;
{
struct fio_file *f = io_u->file;
- return io_u->offset + buflen <= f->io_size +
td->o.start_offset
;
+ return io_u->offset + buflen <= f->io_size +
get_start_offset(td)
;
}
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
}
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
@@
-543,6
+543,8
@@
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
if (td_rw(td) && __should_check_rate(td, odir))
td->rate_pending_usleep[odir] -= usec;
if (td_rw(td) && __should_check_rate(td, odir))
td->rate_pending_usleep[odir] -= usec;
+ if (ddir_trim(ddir))
+ return ddir;
return ddir;
}
return ddir;
}
@@
-599,8
+601,10
@@
static enum fio_ddir get_rw_ddir(struct thread_data *td)
ddir = td->rwmix_ddir;
} else if (td_read(td))
ddir = DDIR_READ;
ddir = td->rwmix_ddir;
} else if (td_read(td))
ddir = DDIR_READ;
- else
+ else
if (td_write(td))
ddir = DDIR_WRITE;
ddir = DDIR_WRITE;
+ else
+ ddir = DDIR_TRIM;
td->rwmix_ddir = rate_ddir(td, ddir);
return td->rwmix_ddir;
td->rwmix_ddir = rate_ddir(td, ddir);
return td->rwmix_ddir;
@@
-1286,10
+1290,12
@@
err_put:
void io_u_log_error(struct thread_data *td, struct io_u *io_u)
{
void io_u_log_error(struct thread_data *td, struct io_u *io_u)
{
+ enum error_type_bit eb = td_error_type(io_u->ddir, io_u->error);
const char *msg[] = { "read", "write", "sync", "datasync",
"sync_file_range", "wait", "trim" };
const char *msg[] = { "read", "write", "sync", "datasync",
"sync_file_range", "wait", "trim" };
-
+ if (td_non_fatal_error(td, eb, io_u->error) && !td->o.error_dump)
+ return;
log_err("fio: io_u error");
log_err("fio: io_u error");
@@
-1406,7
+1412,7
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
(usec_for_io(td, idx) -
utime_since_now(&td->start));
}
(usec_for_io(td, idx) -
utime_since_now(&td->start));
}
- if (__should_check_rate(td, odx))
+ if (
idx != DDIR_TRIM &&
__should_check_rate(td, odx))
td->rate_pending_usleep[odx] =
(usec_for_io(td, odx) -
utime_since_now(&td->start));
td->rate_pending_usleep[odx] =
(usec_for_io(td, odx) -
utime_since_now(&td->start));
@@
-1428,8
+1434,10
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
icd->error = io_u->error;
io_u_log_error(td, io_u);
}
icd->error = io_u->error;
io_u_log_error(td, io_u);
}
- if (icd->error && td_non_fatal_error(icd->error) &&
- (td->o.continue_on_error & td_error_type(io_u->ddir, icd->error))) {
+ if (icd->error) {
+ enum error_type_bit eb = td_error_type(io_u->ddir, icd->error);
+ if (!td_non_fatal_error(td, eb, icd->error))
+ return;
/*
* If there is a non_fatal error, then add to the error count
* and clear all the errors.
/*
* If there is a non_fatal error, then add to the error count
* and clear all the errors.
@@
-1444,13
+1452,15
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
static void init_icd(struct thread_data *td, struct io_completion_data *icd,
int nr)
{
static void init_icd(struct thread_data *td, struct io_completion_data *icd,
int nr)
{
+ int ddir;
if (!td->o.disable_clat || !td->o.disable_bw)
fio_gettime(&icd->time, NULL);
icd->nr = nr;
icd->error = 0;
if (!td->o.disable_clat || !td->o.disable_bw)
fio_gettime(&icd->time, NULL);
icd->nr = nr;
icd->error = 0;
- icd->bytes_done[0] = icd->bytes_done[1] = 0;
+ for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+ icd->bytes_done[ddir] = 0;
}
static void ios_completed(struct thread_data *td,
}
static void ios_completed(struct thread_data *td,
@@
-1489,8
+1499,10
@@
int io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
}
if (bytes) {
}
if (bytes) {
- bytes[0] += icd.bytes_done[0];
- bytes[1] += icd.bytes_done[1];
+ int ddir;
+
+ for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+ bytes[ddir] += icd.bytes_done[ddir];
}
return 0;
}
return 0;
@@
-1527,8
+1539,10
@@
int io_u_queued_complete(struct thread_data *td, int min_evts,
}
if (bytes) {
}
if (bytes) {
- bytes[0] += icd.bytes_done[0];
- bytes[1] += icd.bytes_done[1];
+ int ddir;
+
+ for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+ bytes[ddir] += icd.bytes_done[ddir];
}
return 0;
}
return 0;