projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
io_u: only rewind file position if it's non-zero
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index ffd8707fc44cb3e2cc7c8edb39212c217c5dd5c1..17af3bb92ab8e0747c532836aa5e9bd1e5ce2812 100644
(file)
--- a/
verify.c
+++ b/
verify.c
@@
-30,9
+30,6
@@
static void populate_hdr(struct thread_data *td, struct io_u *io_u,
struct verify_header *hdr, unsigned int header_num,
unsigned int header_len);
static void populate_hdr(struct thread_data *td, struct io_u *io_u,
struct verify_header *hdr, unsigned int header_num,
unsigned int header_len);
-static void fill_hdr(struct thread_data *td, struct io_u *io_u,
- struct verify_header *hdr, unsigned int header_num,
- unsigned int header_len, uint64_t rand_seed);
static void __fill_hdr(struct thread_data *td, struct io_u *io_u,
struct verify_header *hdr, unsigned int header_num,
unsigned int header_len, uint64_t rand_seed);
static void __fill_hdr(struct thread_data *td, struct io_u *io_u,
struct verify_header *hdr, unsigned int header_num,
unsigned int header_len, uint64_t rand_seed);
@@
-90,8
+87,13
@@
static unsigned int get_hdr_inc(struct thread_data *td, struct io_u *io_u)
{
unsigned int hdr_inc;
{
unsigned int hdr_inc;
+ /*
+ * If we use bs_unaligned, buflen can be larger than the verify
+ * interval (which just defaults to the smallest blocksize possible).
+ */
hdr_inc = io_u->buflen;
hdr_inc = io_u->buflen;
- if (td->o.verify_interval && td->o.verify_interval <= io_u->buflen)
+ if (td->o.verify_interval && td->o.verify_interval <= io_u->buflen &&
+ !td->o.bs_unaligned)
hdr_inc = td->o.verify_interval;
return hdr_inc;
hdr_inc = td->o.verify_interval;
return hdr_inc;
@@
-239,7
+241,6
@@
struct vcont {
};
#define DUMP_BUF_SZ 255
};
#define DUMP_BUF_SZ 255
-static int dump_buf_warned;
static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
const char *type, struct fio_file *f)
static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
const char *type, struct fio_file *f)
@@
-252,16
+253,14
@@
static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
memset(fname, 0, sizeof(fname));
if (aux_path)
memset(fname, 0, sizeof(fname));
if (aux_path)
- sprintf(fname, "%s%
s
", aux_path, FIO_OS_PATH_SEPARATOR);
+ sprintf(fname, "%s%
c
", aux_path, FIO_OS_PATH_SEPARATOR);
strncpy(fname + strlen(fname), basename(ptr), buf_left - 1);
buf_left -= strlen(fname);
if (buf_left <= 0) {
strncpy(fname + strlen(fname), basename(ptr), buf_left - 1);
buf_left -= strlen(fname);
if (buf_left <= 0) {
- if (!
dump_buf_warned) {
+ if (!
fio_did_warn(FIO_WARN_VERIFY_BUF))
log_err("fio: verify failure dump buffer too small\n");
log_err("fio: verify failure dump buffer too small\n");
- dump_buf_warned = 1;
- }
free(ptr);
return;
}
free(ptr);
return;
}
@@
-388,7
+387,7
@@
static int verify_io_u_pattern(struct verify_header *hdr, struct vcont *vc)
(void)paste_format_inplace(pattern, pattern_size,
td->o.verify_fmt, td->o.verify_fmt_sz, io_u);
(void)paste_format_inplace(pattern, pattern_size,
td->o.verify_fmt, td->o.verify_fmt_sz, io_u);
- buf = (
void
*) hdr + header_size;
+ buf = (
char
*) hdr + header_size;
len = get_hdr_inc(td, io_u) - header_size;
mod = (get_hdr_inc(td, io_u) * vc->hdr_num + header_size) % pattern_size;
len = get_hdr_inc(td, io_u) - header_size;
mod = (get_hdr_inc(td, io_u) * vc->hdr_num + header_size) % pattern_size;
@@
-749,9
+748,9
@@
int verify_io_u_async(struct thread_data *td, struct io_u **io_u_ptr)
}
flist_add_tail(&io_u->verify_list, &td->verify_list);
*io_u_ptr = NULL;
}
flist_add_tail(&io_u->verify_list, &td->verify_list);
*io_u_ptr = NULL;
- pthread_mutex_unlock(&td->io_u_lock);
pthread_cond_signal(&td->verify_cond);
pthread_cond_signal(&td->verify_cond);
+ pthread_mutex_unlock(&td->io_u_lock);
return 0;
}
return 0;
}
@@
-1167,7
+1166,7
@@
static void __fill_hdr(struct thread_data *td, struct io_u *io_u,
hdr->rand_seed = rand_seed;
hdr->offset = io_u->offset + header_num * td->o.verify_interval;
hdr->time_sec = io_u->start_time.tv_sec;
hdr->rand_seed = rand_seed;
hdr->offset = io_u->offset + header_num * td->o.verify_interval;
hdr->time_sec = io_u->start_time.tv_sec;
- hdr->time_
usec = io_u->start_time.tv_nsec / 1000
;
+ hdr->time_
nsec = io_u->start_time.tv_nsec
;
hdr->thread = td->thread_number;
hdr->numberio = io_u->numberio;
hdr->crc32 = fio_crc32c(p, offsetof(struct verify_header, crc32));
hdr->thread = td->thread_number;
hdr->numberio = io_u->numberio;
hdr->crc32 = fio_crc32c(p, offsetof(struct verify_header, crc32));
@@
-1178,7
+1177,6
@@
static void fill_hdr(struct thread_data *td, struct io_u *io_u,
struct verify_header *hdr, unsigned int header_num,
unsigned int header_len, uint64_t rand_seed)
{
struct verify_header *hdr, unsigned int header_num,
unsigned int header_len, uint64_t rand_seed)
{
-
if (td->o.verify != VERIFY_PATTERN_NO_HDR)
__fill_hdr(td, io_u, hdr, header_num, header_len, rand_seed);
}
if (td->o.verify != VERIFY_PATTERN_NO_HDR)
__fill_hdr(td, io_u, hdr, header_num, header_len, rand_seed);
}
@@
-1188,9
+1186,10
@@
static void populate_hdr(struct thread_data *td, struct io_u *io_u,
unsigned int header_len)
{
unsigned int data_len;
unsigned int header_len)
{
unsigned int data_len;
- void *data, *p;
+ void *data;
+ char *p;
- p = (
void
*) hdr;
+ p = (
char
*) hdr;
fill_hdr(td, io_u, hdr, header_num, header_len, io_u->rand_seed);
fill_hdr(td, io_u, hdr, header_num, header_len, io_u->rand_seed);
@@
-1308,7
+1307,7
@@
int get_next_verify(struct thread_data *td, struct io_u *io_u)
return 0;
if (!RB_EMPTY_ROOT(&td->io_hist_tree)) {
return 0;
if (!RB_EMPTY_ROOT(&td->io_hist_tree)) {
- struct rb_node *n = rb_first(&td->io_hist_tree);
+ struct
fio_
rb_node *n = rb_first(&td->io_hist_tree);
ipo = rb_entry(n, struct io_piece, rb_node);
ipo = rb_entry(n, struct io_piece, rb_node);
@@
-1725,7
+1724,7
@@
void verify_save_state(int mask)
char prefix[PATH_MAX];
if (aux_path)
char prefix[PATH_MAX];
if (aux_path)
- sprintf(prefix, "%s%
s
local", aux_path, FIO_OS_PATH_SEPARATOR);
+ sprintf(prefix, "%s%
c
local", aux_path, FIO_OS_PATH_SEPARATOR);
else
strcpy(prefix, "local");
else
strcpy(prefix, "local");