projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Misc fixes
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 318614cdb39b5213fc8d833a9f028b560f27eb84..ebfa0d45a324111a3cda91a087909cf57e063cbe 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-63,7
+63,7
@@
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
*b = 0;
i = 0;
*b = 0;
i = 0;
- while ((*b) * td->rw_min_bs < f->file_size) {
+ while ((*b) * td->rw_min_bs < f->
real_
file_size) {
if (f->file_map[i] != -1UL) {
*b += ffz(f->file_map[i]);
return 0;
if (f->file_map[i] != -1UL) {
*b += ffz(f->file_map[i]);
return 0;
@@
-108,7
+108,7
@@
static int get_next_offset(struct thread_data *td, struct fio_file *f,
b = f->last_pos / td->min_bs[ddir];
*offset = (b * td->min_bs[ddir]) + f->file_offset;
b = f->last_pos / td->min_bs[ddir];
*offset = (b * td->min_bs[ddir]) + f->file_offset;
- if (*offset > f->file_size)
+ if (*offset > f->
real_
file_size)
return 1;
return 0;
return 1;
return 0;
@@
-123,7
+123,7
@@
static unsigned int get_next_buflen(struct thread_data *td, int ddir)
buflen = td->min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
buflen = td->min_bs[ddir];
else {
r = os_random_long(&td->bsrange_state);
- buflen = (1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
+ buflen = (
unsigned int) (
1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
if (!td->bs_unaligned)
buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
}
if (!td->bs_unaligned)
buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
}
@@
-147,13
+147,13
@@
static unsigned int get_next_buflen(struct thread_data *td, int ddir)
* mixed read/write workload, check the rwmix cycle and switch if
* necessary.
*/
* mixed read/write workload, check the rwmix cycle and switch if
* necessary.
*/
-static
int
get_rw_ddir(struct thread_data *td)
+static
enum fio_ddir
get_rw_ddir(struct thread_data *td)
{
if (td_rw(td)) {
struct timeval now;
unsigned long elapsed;
{
if (td_rw(td)) {
struct timeval now;
unsigned long elapsed;
-
gettimeofday
(&now, NULL);
+
fio_gettime
(&now, NULL);
elapsed = mtime_since_now(&td->rwmix_switch);
/*
elapsed = mtime_since_now(&td->rwmix_switch);
/*
@@
-227,6
+227,31
@@
static int fill_io_u(struct thread_data *td, struct fio_file *f,
return 1;
}
return 1;
}
+static void io_u_mark_depth(struct thread_data *td)
+{
+ int index = 0;
+
+ switch (td->cur_depth) {
+ default:
+ index++;
+ case 32 ... 63:
+ index++;
+ case 16 ... 31:
+ index++;
+ case 8 ... 15:
+ index++;
+ case 4 ... 7:
+ index++;
+ case 2 ... 3:
+ index++;
+ case 1:
+ break;
+ }
+
+ td->io_u_map[index]++;
+ td->total_io_u++;
+}
+
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;
@@
-240,6
+265,7
@@
struct io_u *__get_io_u(struct thread_data *td)
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_busylist);
td->cur_depth++;
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_busylist);
td->cur_depth++;
+ io_u_mark_depth(td);
}
return io_u;
}
return io_u;
@@
-267,13
+293,13
@@
struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
return NULL;
}
return NULL;
}
- if (io_u->buflen + io_u->offset > f->file_size) {
+ if (io_u->buflen + io_u->offset > f->
real_
file_size) {
if (td->io_ops->flags & FIO_RAWIO) {
put_io_u(td, io_u);
return NULL;
}
if (td->io_ops->flags & FIO_RAWIO) {
put_io_u(td, io_u);
return NULL;
}
- io_u->buflen = f->file_size - io_u->offset;
+ io_u->buflen = f->
real_
file_size - io_u->offset;
}
if (io_u->ddir != DDIR_SYNC) {
}
if (io_u->ddir != DDIR_SYNC) {
@@
-296,14
+322,19
@@
struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
return NULL;
}
return NULL;
}
- gettimeofday(&io_u->start_time, NULL);
+ /*
+ * Set io data pointers.
+ */
+ io_u->xfer_buf = io_u->buf;
+ io_u->xfer_buflen = io_u->buflen;
+
+ fio_gettime(&io_u->start_time, NULL);
return io_u;
}
void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
return io_u;
}
void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
- struct timeval e;
unsigned long msec;
if (io_u->ddir == DDIR_SYNC) {
unsigned long msec;
if (io_u->ddir == DDIR_SYNC) {
@@
-313,21
+344,21
@@
void io_completed(struct thread_data *td, struct io_u *io_u,
td->last_was_sync = 0;
td->last_was_sync = 0;
- gettimeofday(&e, NULL);
-
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
if (!io_u->error) {
unsigned int bytes = io_u->buflen - io_u->resid;
- const
int
idx = io_u->ddir;
+ const
enum fio_ddir
idx = io_u->ddir;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
td->zone_bytes += bytes;
td->this_io_bytes[idx] += bytes;
td->io_blocks[idx]++;
td->io_bytes[idx] += bytes;
td->zone_bytes += bytes;
td->this_io_bytes[idx] += bytes;
- msec = mtime_since(&io_u->issue_time, &e);
+ io_u->file->last_completed_pos = io_u->offset + io_u->buflen;
+
+ msec = mtime_since(&io_u->issue_time, &icd->time);
add_clat_sample(td, idx, msec);
add_clat_sample(td, idx, msec);
- add_bw_sample(td, idx);
+ add_bw_sample(td, idx
, &icd->time
);
if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
log_io_piece(td, io_u);
@@
-342,6
+373,8
@@
void ios_completed(struct thread_data *td, struct io_completion_data *icd)
struct io_u *io_u;
int i;
struct io_u *io_u;
int i;
+ fio_gettime(&icd->time, NULL);
+
icd->error = 0;
icd->bytes_done[0] = icd->bytes_done[1] = 0;
icd->error = 0;
icd->bytes_done[0] = icd->bytes_done[1] = 0;
@@
-352,5
+385,3
@@
void ios_completed(struct thread_data *td, struct io_completion_data *icd)
put_io_u(td, io_u);
}
}
put_io_u(td, io_u);
}
}
-
-