projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add clue for ENOMEM hugepage allocation
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 0580f42650e428b02f48752079d346afb8bfdb6c..e0614bd0a11946f132a6b0063e0015ff6e6ad48b 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-6,7
+6,6
@@
#include <assert.h>
#include "fio.h"
#include <assert.h>
#include "fio.h"
-#include "os.h"
/*
* Change this define to play with the timeout handling
/*
* Change this define to play with the timeout handling
@@
-85,7
+84,7
@@
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
*b = (i * BLOCKS_PER_MAP);
while ((*b) * td->o.rw_min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
*b = (i * BLOCKS_PER_MAP);
while ((*b) * td->o.rw_min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
- *b += ffz(f->file_map[i]);
+ *b += f
io_f
fz(f->file_map[i]);
f->last_free_lookup = i;
return 0;
}
f->last_free_lookup = i;
return 0;
}
@@
-100,7
+99,7
@@
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
int ddir, unsigned long long *b)
{
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
int ddir, unsigned long long *b)
{
- unsigned long long max_blocks = f->
file
_size / td->o.min_bs[ddir];
+ unsigned long long max_blocks = f->
io
_size / td->o.min_bs[ddir];
unsigned long long r, rb;
int loops = 5;
unsigned long long r, rb;
int loops = 5;
@@
-110,20
+109,40
@@
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
*b = 0;
else
*b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
*b = 0;
else
*b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+ /*
+ * if we are not maintaining a random map, we are done.
+ */
if (td->o.norandommap)
if (td->o.norandommap)
- break;
+ return 0;
+
+ /*
+ * calculate map offset and chec if it's free
+ */
rb = *b + (f->file_offset / td->o.min_bs[ddir]);
rb = *b + (f->file_offset / td->o.min_bs[ddir]);
- loops--;
- } while (!random_map_free(td, f, rb) && loops);
+ if (random_map_free(td, f, rb))
+ return 0;
+
+ } while (--loops);
/*
/*
- * if we failed to retrieve a truly random offset within
- * the loops assigned, see if there are free ones left at all
+ * we get here, if we didn't suceed in looking up a block. generate
+ * a random start offset into the filemap, and find the first free
+ * block from there.
*/
*/
- if (!loops && get_next_free_block(td, f, b))
- return 1;
+ loops = 10;
+ do {
+ f->last_free_lookup = (f->num_maps - 1) * (r / (RAND_MAX+1.0));
+ if (!get_next_free_block(td, f, b))
+ return 0;
- return 0;
+ r = os_random_long(&td->random_state);
+ } while (--loops);
+
+ /*
+ * that didn't work either, try exhaustive search from the start
+ */
+ f->last_free_lookup = 0;
+ return get_next_free_block(td, f, b);
}
/*
}
/*
@@
-142,8
+161,12
@@
static int get_next_offset(struct thread_data *td, struct io_u *io_u)
if (get_next_rand_offset(td, f, ddir, &b))
return 1;
if (get_next_rand_offset(td, f, ddir, &b))
return 1;
- } else
+ } else {
+ if (f->last_pos >= f->real_file_size)
+ return 1;
+
b = f->last_pos / td->o.min_bs[ddir];
b = f->last_pos / td->o.min_bs[ddir];
+ }
io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
if (io_u->offset >= f->real_file_size)
io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
if (io_u->offset >= f->real_file_size)
@@
-154,7
+177,6
@@
static int get_next_offset(struct thread_data *td, struct io_u *io_u)
static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
{
static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
{
- struct fio_file *f = io_u->file;
const int ddir = io_u->ddir;
unsigned int buflen;
long r;
const int ddir = io_u->ddir;
unsigned int buflen;
long r;
@@
-168,19
+190,6
@@
static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
}
buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
}
- while (buflen + io_u->offset > f->real_file_size) {
- if (buflen == td->o.min_bs[ddir]) {
- if (!td->o.odirect) {
- assert(io_u->offset <= f->real_file_size);
- buflen = f->real_file_size - io_u->offset;
- return buflen;
- }
- return 0;
- }
-
- buflen = td->o.min_bs[ddir];
- }
-
return buflen;
}
return buflen;
}
@@
-250,7
+259,7
@@
static enum fio_ddir get_rw_ddir(struct thread_data *td)
*/
ddir = get_rand_ddir(td);
max_bytes = td->this_io_bytes[ddir];
*/
ddir = get_rand_ddir(td);
max_bytes = td->this_io_bytes[ddir];
- if (max_bytes >= (td->
io_
size * td->o.rwmix[ddir] / 100)) {
+ if (max_bytes >= (td->
o.
size * td->o.rwmix[ddir] / 100)) {
if (!td->rw_end_set[ddir]) {
td->rw_end_set[ddir] = 1;
memcpy(&td->rw_end[ddir], &now, sizeof(now));
if (!td->rw_end_set[ddir]) {
td->rw_end_set[ddir] = 1;
memcpy(&td->rw_end[ddir], &now, sizeof(now));
@@
-276,6
+285,9
@@
void put_io_u(struct thread_data *td, struct io_u *io_u)
assert((io_u->flags & IO_U_F_FREE) == 0);
io_u->flags |= IO_U_F_FREE;
assert((io_u->flags & IO_U_F_FREE) == 0);
io_u->flags |= IO_U_F_FREE;
+ if (io_u->file)
+ put_file(td, io_u->file);
+
io_u->file = NULL;
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_freelist);
io_u->file = NULL;
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_freelist);
@@
-300,7
+312,7
@@
static int fill_io_u(struct thread_data *td, struct io_u *io_u)
/*
* If using an iolog, grab next piece if any available.
*/
/*
* If using an iolog, grab next piece if any available.
*/
- if (td->o.read_iolog)
+ if (td->o.read_iolog
_file
)
return read_iolog_get(td, io_u);
/*
return read_iolog_get(td, io_u);
/*
@@
-310,7
+322,7
@@
static int fill_io_u(struct thread_data *td, struct io_u *io_u)
!(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
td->io_issues[DDIR_WRITE] && should_fsync(td)) {
io_u->ddir = DDIR_SYNC;
!(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
td->io_issues[DDIR_WRITE] && should_fsync(td)) {
io_u->ddir = DDIR_SYNC;
-
return 0
;
+
goto out
;
}
io_u->ddir = get_rw_ddir(td);
}
io_u->ddir = get_rw_ddir(td);
@@
-329,12
+341,13
@@
static int fill_io_u(struct thread_data *td, struct io_u *io_u)
/*
* mark entry before potentially trimming io_u
*/
/*
* mark entry before potentially trimming io_u
*/
- if (
!td->o.read_iolog &&
td_random(td) && !td->o.norandommap)
+ if (td_random(td) && !td->o.norandommap)
mark_random_map(td, io_u);
/*
* If using a write iolog, store this entry.
*/
mark_random_map(td, io_u);
/*
* If using a write iolog, store this entry.
*/
+out:
if (td->o.write_iolog_file)
write_iolog_put(td, io_u);
if (td->o.write_iolog_file)
write_iolog_put(td, io_u);
@@
-350,17
+363,22
@@
void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
switch (td->cur_depth) {
default:
switch (td->cur_depth) {
default:
- index++;
+ index = 6;
+ break;
case 32 ... 63:
case 32 ... 63:
- index++;
+ index = 5;
+ break;
case 16 ... 31:
case 16 ... 31:
- index++;
+ index = 4;
+ break;
case 8 ... 15:
case 8 ... 15:
- index++;
+ index = 3;
+ break;
case 4 ... 7:
case 4 ... 7:
- index++;
+ index = 2;
+ break;
case 2 ... 3:
case 2 ... 3:
- index
++
;
+ index
= 1
;
case 1:
break;
}
case 1:
break;
}
@@
-369,38
+387,98
@@
void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
td->ts.total_io_u[io_u->ddir]++;
}
td->ts.total_io_u[io_u->ddir]++;
}
-static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
+static void io_u_mark_lat_usec(struct thread_data *td, unsigned long usec)
+{
+ int index = 0;
+
+ assert(usec < 1000);
+
+ switch (usec) {
+ case 750 ... 999:
+ index = 9;
+ break;
+ case 500 ... 749:
+ index = 8;
+ break;
+ case 250 ... 499:
+ index = 7;
+ break;
+ case 100 ... 249:
+ index = 6;
+ break;
+ case 50 ... 99:
+ index = 5;
+ break;
+ case 20 ... 49:
+ index = 4;
+ break;
+ case 10 ... 19:
+ index = 3;
+ break;
+ case 4 ... 9:
+ index = 2;
+ break;
+ case 2 ... 3:
+ index = 1;
+ case 0 ... 1:
+ break;
+ }
+
+ assert(index < FIO_IO_U_LAT_U_NR);
+ td->ts.io_u_lat_u[index]++;
+}
+
+static void io_u_mark_lat_msec(struct thread_data *td, unsigned long msec)
{
int index = 0;
switch (msec) {
default:
{
int index = 0;
switch (msec) {
default:
- index++;
+ index = 11;
+ break;
case 1000 ... 1999:
case 1000 ... 1999:
- index++;
+ index = 10;
+ break;
case 750 ... 999:
case 750 ... 999:
- index++;
+ index = 9;
+ break;
case 500 ... 749:
case 500 ... 749:
- index++;
+ index = 8;
+ break;
case 250 ... 499:
case 250 ... 499:
- index++;
+ index = 7;
+ break;
case 100 ... 249:
case 100 ... 249:
- index++;
+ index = 6;
+ break;
case 50 ... 99:
case 50 ... 99:
- index++;
+ index = 5;
+ break;
case 20 ... 49:
case 20 ... 49:
- index++;
+ index = 4;
+ break;
case 10 ... 19:
case 10 ... 19:
- index++;
+ index = 3;
+ break;
case 4 ... 9:
case 4 ... 9:
- index++;
+ index = 2;
+ break;
case 2 ... 3:
case 2 ... 3:
- index
++
;
+ index
= 1
;
case 0 ... 1:
break;
}
case 0 ... 1:
break;
}
- td->ts.io_u_lat[index]++;
+ assert(index < FIO_IO_U_LAT_M_NR);
+ td->ts.io_u_lat_m[index]++;
+}
+
+static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
+{
+ if (usec < 1000)
+ io_u_mark_lat_usec(td, usec);
+ else
+ io_u_mark_lat_msec(td, usec / 1000);
}
/*
}
/*
@@
-417,6
+495,8
@@
static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
f = &td->files[fno];
fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
f = &td->files[fno];
+ if (f->flags & FIO_FILE_DONE)
+ continue;
if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
return f;
if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
return f;
@@
-439,6
+519,11
@@
static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
if (td->next_file >= td->o.nr_files)
td->next_file = 0;
if (td->next_file >= td->o.nr_files)
td->next_file = 0;
+ if (f->flags & FIO_FILE_DONE) {
+ f = NULL;
+ continue;
+ }
+
if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
break;
if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
break;
@@
-454,7
+539,7
@@
static struct fio_file *get_next_file(struct thread_data *td)
assert(td->o.nr_files <= td->files_index);
assert(td->o.nr_files <= td->files_index);
- if (!td->nr_open_files)
+ if (!td->nr_open_files
|| td->nr_done_files >= td->o.nr_files
)
return NULL;
f = td->file_service_file;
return NULL;
f = td->file_service_file;
@@
-475,6
+560,9
@@
static struct fio_file *find_next_new_file(struct thread_data *td)
{
struct fio_file *f;
{
struct fio_file *f;
+ if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files)
+ return NULL;
+
if (td->o.file_service_type == FIO_FSERVICE_RR)
f = get_next_file_rr(td, 0, FIO_FILE_OPEN);
else
if (td->o.file_service_type == FIO_FSERVICE_RR)
f = get_next_file_rr(td, 0, FIO_FILE_OPEN);
else
@@
-540,15
+628,19
@@
struct io_u *get_io_u(struct thread_data *td)
set_file:
io_u->file = f;
set_file:
io_u->file = f;
+ get_file(f);
if (!fill_io_u(td, io_u))
break;
/*
if (!fill_io_u(td, io_u))
break;
/*
- * No more to do for this file, close it
+ * td_io_close() does a put_file() as well, so no need to
+ * do that here.
*/
io_u->file = NULL;
td_io_close_file(td, f);
*/
io_u->file = NULL;
td_io_close_file(td, f);
+ f->flags |= FIO_FILE_DONE;
+ td->nr_done_files++;
/*
* probably not the right place to do this, but see
/*
* probably not the right place to do this, but see
@@
-566,20
+658,13
@@
set_file:
}
} while (1);
}
} while (1);
+ assert(io_u->file->flags & FIO_FILE_OPEN);
+
if (td->zone_bytes >= td->o.zone_size) {
td->zone_bytes = 0;
f->last_pos += td->o.zone_skip;
}
if (td->zone_bytes >= td->o.zone_size) {
td->zone_bytes = 0;
f->last_pos += td->o.zone_skip;
}
- 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;
- }
-
- io_u->buflen = f->real_file_size - io_u->offset;
- }
-
if (io_u->ddir != DDIR_SYNC) {
if (!io_u->buflen) {
put_io_u(td, io_u);
if (io_u->ddir != DDIR_SYNC) {
if (!io_u->buflen) {
put_io_u(td, io_u);
@@
-595,6
+680,7
@@
set_file:
/*
* Set io data pointers.
*/
/*
* Set io data pointers.
*/
+ io_u->endpos = io_u->offset + io_u->buflen;
out:
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
out:
io_u->xfer_buf = io_u->buf;
io_u->xfer_buflen = io_u->buflen;
@@
-628,13
+714,11
@@
void io_u_log_error(struct thread_data *td, struct io_u *io_u)
static void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
static void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
- unsigned long
m
sec;
+ unsigned long
u
sec;
assert(io_u->flags & IO_U_F_FLIGHT);
io_u->flags &= ~IO_U_F_FLIGHT;
assert(io_u->flags & IO_U_F_FLIGHT);
io_u->flags &= ~IO_U_F_FLIGHT;
- put_file(td, io_u->file);
-
if (io_u->ddir == DDIR_SYNC) {
td->last_was_sync = 1;
return;
if (io_u->ddir == DDIR_SYNC) {
td->last_was_sync = 1;
return;
@@
-652,15
+736,15
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
td->zone_bytes += bytes;
td->this_io_bytes[idx] += bytes;
td->zone_bytes += bytes;
td->this_io_bytes[idx] += bytes;
- io_u->file->last_completed_pos = io_u->
offset + io_u->buflen
;
+ io_u->file->last_completed_pos = io_u->
endpos
;
-
msec = m
time_since(&io_u->issue_time, &icd->time);
+
usec = u
time_since(&io_u->issue_time, &icd->time);
- add_clat_sample(td, idx,
m
sec);
+ add_clat_sample(td, idx,
u
sec);
add_bw_sample(td, idx, &icd->time);
add_bw_sample(td, idx, &icd->time);
- io_u_mark_latency(td,
m
sec);
+ io_u_mark_latency(td,
u
sec);
- if (
(td_rw(td) || td_write(td)
) && idx == DDIR_WRITE &&
+ if (
td_write(td
) && idx == DDIR_WRITE &&
td->o.verify != VERIFY_NONE)
log_io_piece(td, io_u);
td->o.verify != VERIFY_NONE)
log_io_piece(td, io_u);
@@
-755,7
+839,7
@@
void io_u_queued(struct thread_data *td, struct io_u *io_u)
{
unsigned long slat_time;
{
unsigned long slat_time;
- slat_time =
m
time_since(&io_u->start_time, &io_u->issue_time);
+ slat_time =
u
time_since(&io_u->start_time, &io_u->issue_time);
add_slat_sample(td, io_u->ddir, slat_time);
}
add_slat_sample(td, io_u->ddir, slat_time);
}