projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
steadystate: add free helper
[fio.git]
/
verify.c
diff --git
a/verify.c
b/verify.c
index cadfe9c32825d99f818ff879cbe67273c41cd15d..2faeaad69302032c8828c9c4451399a7f5ef54ab 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);
@@
-252,7
+249,7
@@
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);
strncpy(fname + strlen(fname), basename(ptr), buf_left - 1);
@@
-271,6
+268,7
@@
static void dump_buf(char *buf, unsigned int len, unsigned long long offset,
fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644);
if (fd < 0) {
perror("open verify buf file");
fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644);
if (fd < 0) {
perror("open verify buf file");
+ free(ptr);
return;
}
return;
}
@@
-387,7
+385,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;
@@
-1166,7
+1164,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_u
sec;
+ hdr->time_
nsec = io_u->start_time.tv_n
sec;
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));
@@
-1187,9
+1185,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);
@@
-1724,7
+1723,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");