projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio is also available over http://
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index f748065d7fc031b66098334aef419654b5ff25c9..46e610d713fd221d0e10b7cc74579f5ffb54fc10 100644
(file)
--- a/
verify.c
+++ b/
verify.c
@@
-6,7
+6,6
@@
#include <string.h>
#include "fio.h"
#include <string.h>
#include "fio.h"
-#include "os.h"
static void fill_random_bytes(struct thread_data *td,
unsigned char *p, unsigned int len)
static void fill_random_bytes(struct thread_data *td,
unsigned char *p, unsigned int len)
@@
-78,11
+77,14
@@
static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
return 0;
}
return 0;
}
-int verify_io_u(struct io_u *io_u)
+int verify_io_u(struct
thread_data *td, struct
io_u *io_u)
{
struct verify_header *hdr = (struct verify_header *) io_u->buf;
int ret;
{
struct verify_header *hdr = (struct verify_header *) io_u->buf;
int ret;
+ if (td->o.verify == VERIFY_NULL)
+ return 0;
+
if (hdr->fio_magic != FIO_HDR_MAGIC) {
log_err("Bad verify header %x\n", hdr->fio_magic);
return EIO;
if (hdr->fio_magic != FIO_HDR_MAGIC) {
log_err("Bad verify header %x\n", hdr->fio_magic);
return EIO;
@@
-126,6
+128,9
@@
void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
unsigned char *p = (unsigned char *) io_u->buf;
struct verify_header hdr;
unsigned char *p = (unsigned char *) io_u->buf;
struct verify_header hdr;
+ if (td->o.verify == VERIFY_NULL)
+ return;
+
hdr.fio_magic = FIO_HDR_MAGIC;
hdr.len = io_u->buflen;
p += sizeof(hdr);
hdr.fio_magic = FIO_HDR_MAGIC;
hdr.len = io_u->buflen;
p += sizeof(hdr);
@@
-134,7
+139,7
@@
void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
if (td->o.verify == VERIFY_MD5) {
fill_md5(&hdr, p, io_u->buflen - sizeof(hdr));
hdr.verify_type = VERIFY_MD5;
if (td->o.verify == VERIFY_MD5) {
fill_md5(&hdr, p, io_u->buflen - sizeof(hdr));
hdr.verify_type = VERIFY_MD5;
- } else {
+ } else
if (td->o.verify == VERIFY_CRC32)
{
fill_crc32(&hdr, p, io_u->buflen - sizeof(hdr));
hdr.verify_type = VERIFY_CRC32;
}
fill_crc32(&hdr, p, io_u->buflen - sizeof(hdr));
hdr.verify_type = VERIFY_CRC32;
}
@@
-144,7
+149,7
@@
void populate_verify_io_u(struct thread_data *td, struct io_u *io_u)
int get_next_verify(struct thread_data *td, struct io_u *io_u)
{
int get_next_verify(struct thread_data *td, struct io_u *io_u)
{
- struct io_piece *ipo;
+ struct io_piece *ipo
= NULL
;
/*
* this io_u is from a requeue, we already filled the offsets
/*
* this io_u is from a requeue, we already filled the offsets
@@
-152,11
+157,17
@@
int get_next_verify(struct thread_data *td, struct io_u *io_u)
if (io_u->file)
return 0;
if (io_u->file)
return 0;
- if (!
list_empty(&td->io_hist_list
)) {
-
ipo = list_entry(td->io_hist_list.next, struct io_piece, list
);
+ if (!
RB_EMPTY_ROOT(&td->io_hist_tree
)) {
+
struct rb_node *n = rb_first(&td->io_hist_tree
);
+ ipo = rb_entry(n, struct io_piece, rb_node);
+ rb_erase(n, &td->io_hist_tree);
+ } else if (!list_empty(&td->io_hist_list)) {
+ ipo = list_entry(td->io_hist_list.next, struct io_piece, list);
list_del(&ipo->list);
list_del(&ipo->list);
+ }
+ if (ipo) {
io_u->offset = ipo->offset;
io_u->buflen = ipo->len;
io_u->file = ipo->file;
io_u->offset = ipo->offset;
io_u->buflen = ipo->len;
io_u->file = ipo->file;