projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fully parallellize io_u verification
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 89ece538c570391b8812957f2e4a428d1ab1bb65..ebcc8bb283eb6a65e93db799cfe9e2f83993f85e 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-3,7
+3,6
@@
#include <string.h>
#include <signal.h>
#include <time.h>
#include <string.h>
#include <signal.h>
#include <time.h>
-#include <assert.h>
#include "fio.h"
#include "os.h"
#include "fio.h"
#include "os.h"
@@
-45,7
+44,7
@@
static void mark_random_map(struct thread_data *td, struct fio_file *f,
idx = RAND_MAP_IDX(td, f, block);
bit = RAND_MAP_BIT(td, f, block);
idx = RAND_MAP_IDX(td, f, block);
bit = RAND_MAP_BIT(td, f, block);
-
assert(
idx < f->num_maps);
+
fio_assert(td,
idx < f->num_maps);
f->file_map[idx] |= (1UL << bit);
block++;
f->file_map[idx] |= (1UL << bit);
block++;
@@
-138,13
+137,6
@@
static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f,
}
while (buflen + io_u->offset > f->real_file_size) {
}
while (buflen + io_u->offset > f->real_file_size) {
- /*
- * if using direct/raw io, we may not be able to
- * shrink the size. so just fail it.
- */
- if (td->io_ops->flags & FIO_RAWIO)
- return 0;
-
if (buflen == td->min_bs[ddir])
return 0;
if (buflen == td->min_bs[ddir])
return 0;
@@
-271,6
+263,40
@@
static void io_u_mark_depth(struct thread_data *td)
td->total_io_u++;
}
td->total_io_u++;
}
+static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
+{
+ int index = 0;
+
+ switch (msec) {
+ default:
+ index++;
+ case 1024 ... 2047:
+ index++;
+ case 512 ... 1023:
+ index++;
+ case 256 ... 511:
+ index++;
+ case 128 ... 255:
+ index++;
+ case 64 ... 127:
+ index++;
+ case 32 ... 63:
+ index++;
+ case 16 ... 31:
+ index++;
+ case 8 ... 15:
+ index++;
+ case 4 ... 7:
+ index++;
+ case 2 ... 3:
+ index++;
+ case 0 ... 1:
+ break;
+ }
+
+ td->io_u_lat[index]++;
+}
+
struct io_u *__get_io_u(struct thread_data *td)
{
struct io_u *io_u = NULL;
struct io_u *__get_io_u(struct thread_data *td)
{
struct io_u *io_u = NULL;
@@
-327,23
+353,23
@@
struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
return NULL;
}
return NULL;
}
- f->last_pos
+=
io_u->buflen;
+ f->last_pos
= io_u->offset +
io_u->buflen;
if (td->verify != VERIFY_NONE)
populate_verify_io_u(td, io_u);
}
if (td->verify != VERIFY_NONE)
populate_verify_io_u(td, io_u);
}
- if (td_io_prep(td, io_u)) {
- put_io_u(td, io_u);
- return NULL;
- }
-
/*
* Set io data pointers.
*/
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
/*
* Set io data pointers.
*/
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
+ if (td_io_prep(td, io_u)) {
+ put_io_u(td, io_u);
+ return NULL;
+ }
+
fio_gettime(&io_u->start_time, NULL);
return io_u;
}
fio_gettime(&io_u->start_time, NULL);
return io_u;
}
@@
-363,6
+389,7
@@
void io_completed(struct thread_data *td, struct io_u *io_u,
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
const enum fio_ddir idx = io_u->ddir;
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
const enum fio_ddir idx = io_u->ddir;
+ int ret;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
@@
-375,24
+402,37
@@
void io_completed(struct thread_data *td, struct io_u *io_u,
add_clat_sample(td, idx, msec);
add_bw_sample(td, idx, &icd->time);
add_clat_sample(td, idx, msec);
add_bw_sample(td, idx, &icd->time);
+ io_u_mark_latency(td, msec);
if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
icd->bytes_done[idx] += bytes;
if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
icd->bytes_done[idx] += bytes;
+
+ if (icd->handler) {
+ ret = icd->handler(io_u);
+ if (ret && !icd->error)
+ icd->error = ret;
+ }
} else
icd->error = io_u->error;
}
} else
icd->error = io_u->error;
}
-void i
os_completed(struct thread_data *td, struct io_completion_data *icd
)
+void i
nit_icd(struct io_completion_data *icd, icd_handler *handler, int nr
)
{
{
- struct io_u *io_u;
- int i;
-
fio_gettime(&icd->time, NULL);
fio_gettime(&icd->time, NULL);
+ icd->handler = handler;
+ icd->nr = nr;
+
icd->error = 0;
icd->bytes_done[0] = icd->bytes_done[1] = 0;
icd->error = 0;
icd->bytes_done[0] = icd->bytes_done[1] = 0;
+}
+
+void ios_completed(struct thread_data *td, struct io_completion_data *icd)
+{
+ struct io_u *io_u;
+ int i;
for (i = 0; i < icd->nr; i++) {
io_u = td->io_ops->event(td, i);
for (i = 0; i < icd->nr; i++) {
io_u = td->io_ops->event(td, i);