projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add --debug=parse for option parsing debug
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 9ab33f39da6cec4eb2fb2ae3c29e961660020438..7ac31a0d297872fe82168e74cff63cfce1880dcb 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-25,11
+25,13
@@
struct io_completion_data {
* to yet. Used to make sure we cover the entire range in a fair fashion.
*/
static int random_map_free(struct thread_data *td, struct fio_file *f,
* to yet. Used to make sure we cover the entire range in a fair fashion.
*/
static int random_map_free(struct thread_data *td, struct fio_file *f,
- unsigned long long block)
+
const
unsigned long long block)
{
unsigned int idx = RAND_MAP_IDX(td, f, block);
unsigned int bit = RAND_MAP_BIT(td, f, block);
{
unsigned int idx = RAND_MAP_IDX(td, f, block);
unsigned int bit = RAND_MAP_BIT(td, f, block);
+ dprint(FD_RANDOM, "free: b=%llu, idx=%u, bit=%u\n", block, idx, bit);
+
return (f->file_map[idx] & (1UL << bit)) == 0;
}
return (f->file_map[idx] & (1UL << bit)) == 0;
}
@@
-78,7
+80,7
@@
static inline unsigned long long last_block(struct thread_data *td,
{
unsigned long long max_blocks;
{
unsigned long long max_blocks;
- max_blocks = f->io_size / td->o.min_bs[ddir];
+ max_blocks = f->io_size /
(unsigned long long)
td->o.min_bs[ddir];
if (!max_blocks)
return 0;
if (!max_blocks)
return 0;
@@
-91,11
+93,12
@@
static inline unsigned long long last_block(struct thread_data *td,
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
enum fio_ddir ddir, unsigned long long *b)
{
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
enum fio_ddir ddir, unsigned long long *b)
{
+ unsigned long long min_bs = td->o.rw_min_bs;
int i;
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
int i;
i = f->last_free_lookup;
*b = (i * BLOCKS_PER_MAP);
- while ((*b) *
td->o.rw_
min_bs < f->real_file_size) {
+ while ((*b) * min_bs < f->real_file_size) {
if (f->file_map[i] != -1UL) {
*b += fio_ffz(f->file_map[i]);
if (*b > last_block(td, f, ddir))
if (f->file_map[i] != -1UL) {
*b += fio_ffz(f->file_map[i]);
if (*b > last_block(td, f, ddir))
@@
-115,12
+118,13
@@
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,
enum fio_ddir ddir, unsigned long long *b)
{
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
enum fio_ddir ddir, unsigned long long *b)
{
- unsigned long long r
, rb
;
+ unsigned long long r;
int loops = 5;
do {
r = os_random_long(&td->random_state);
int loops = 5;
do {
r = os_random_long(&td->random_state);
- *b = last_block(td, f, ddir);
+ dprint(FD_RANDOM, "off rand %llu\n", r);
+ *b = (last_block(td, f, ddir) - 1) * (r / ((unsigned long long) RAND_MAX + 1.0));
/*
* if we are not maintaining a random map, we are done.
/*
* if we are not maintaining a random map, we are done.
@@
-129,12
+133,13
@@
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
return 0;
/*
return 0;
/*
- * calculate map offset and chec if it's free
+ * calculate map offset and chec
k
if it's free
*/
*/
- rb = *b;
- if (random_map_free(td, f, rb))
+ if (random_map_free(td, f, *b))
return 0;
return 0;
+ dprint(FD_RANDOM, "get_next_rand_offset: offset %llu busy\n",
+ *b);
} while (--loops);
/*
} while (--loops);
/*