projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix warnings from icc
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index 134355603cb14e417344d5b4058b8a9ee14874cf..f61215eae73e2b63e3868e713f99bf95eddeb240 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-5,7
+5,7
@@
void write_iolog_put(struct thread_data *td, struct io_u *io_u)
{
void write_iolog_put(struct thread_data *td, struct io_u *io_u)
{
- fprintf(td->iolog_f, "%
d
,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
+ fprintf(td->iolog_f, "%
u
,%llu,%u\n", io_u->ddir, io_u->offset, io_u->buflen);
}
int read_iolog_get(struct thread_data *td, struct io_u *io_u)
}
int read_iolog_get(struct thread_data *td, struct io_u *io_u)
@@
-125,9
+125,9
@@
static int init_iolog_read(struct thread_data *td)
INIT_LIST_HEAD(&ipo->list);
ipo->offset = offset;
ipo->len = bytes;
INIT_LIST_HEAD(&ipo->list);
ipo->offset = offset;
ipo->len = bytes;
- i
f (bytes > td->max_bs)
- td->max_bs = bytes;
-
ipo->ddir = rw
;
+ i
po->ddir = (enum fio_ddir) rw;
+ if (bytes > td->max_bs[rw])
+
td->max_bs[rw] = bytes
;
list_add_tail(&ipo->list, &td->io_log_list);
}
list_add_tail(&ipo->list, &td->io_log_list);
}
@@
-172,12
+172,15
@@
int init_iolog(struct thread_data *td)
{
int ret = 0;
{
int ret = 0;
+ if (td->io_ops->flags & FIO_CPUIO)
+ return 0;
+
if (td->read_iolog_file)
ret = init_iolog_read(td);
else if (td->write_iolog_file)
ret = init_iolog_write(td);
if (td->read_iolog_file)
ret = init_iolog_read(td);
else if (td->write_iolog_file)
ret = init_iolog_write(td);
- return
0
;
+ return
ret
;
}
int setup_rate(struct thread_data *td)
}
int setup_rate(struct thread_data *td)
@@
-192,7
+195,7
@@
int setup_rate(struct thread_data *td)
return -1;
}
return -1;
}
- nr_reads_per_sec = (td->rate * 1024) / td->min_bs;
+ nr_reads_per_sec = (td->rate * 1024) / td->min_bs
[DDIR_READ]
;
td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
td->rate_pending_usleep = 0;
return 0;
td->rate_usec_cycle = 1000000 / nr_reads_per_sec;
td->rate_pending_usleep = 0;
return 0;