projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Define pointer alignment macro in fio.h
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index dcf7a40562531af0a55cd56ddb7d02a00527bdd6..1daaf7bea48407c1e6b21f5143730a7c3d22ff97 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-531,8
+531,7
@@
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
int ddir = io_u->ddir;
unsigned int buflen = 0;
unsigned int minbs, maxbs;
int ddir = io_u->ddir;
unsigned int buflen = 0;
unsigned int minbs, maxbs;
- uint64_t frand_max;
- unsigned long r;
+ uint64_t frand_max, r;
assert(ddir_rw(ddir));
assert(ddir_rw(ddir));
@@
-561,7
+560,7
@@
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
if (buflen < minbs)
buflen = minbs;
} else {
if (buflen < minbs)
buflen = minbs;
} else {
- long perc = 0;
+ long
long
perc = 0;
unsigned int i;
for (i = 0; i < td->o.bssplit_nr[ddir]; i++) {
unsigned int i;
for (i = 0; i < td->o.bssplit_nr[ddir]; i++) {
@@
-569,16
+568,14
@@
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
buflen = bsp->bs;
perc += bsp->perc;
buflen = bsp->bs;
perc += bsp->perc;
- if ((r * 100UL <= frand_max * perc) &&
+ if (!perc)
+ break;
+ if ((r / perc <= frand_max / 100ULL) &&
io_u_fits(td, io_u, buflen))
break;
}
}
io_u_fits(td, io_u, buflen))
break;
}
}
- if (td->o.verify != VERIFY_NONE)
- buflen = (buflen + td->o.verify_interval - 1) &
- ~(td->o.verify_interval - 1);
-
if (!td->o.bs_unaligned && is_power_of_2(minbs))
buflen &= ~(minbs - 1);
if (!td->o.bs_unaligned && is_power_of_2(minbs))
buflen &= ~(minbs - 1);
@@
-652,13
+649,17
@@
int io_u_quiesce(struct thread_data *td)
completed += ret;
}
completed += ret;
}
+ if (td->flags & TD_F_REGROW_LOGS)
+ regrow_logs(td);
+
return completed;
}
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
{
enum fio_ddir odir = ddir ^ 1;
return completed;
}
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
{
enum fio_ddir odir = ddir ^ 1;
- long usec, now;
+ long usec;
+ uint64_t now;
assert(ddir_rw(ddir));
now = utime_since_now(&td->start);
assert(ddir_rw(ddir));
now = utime_since_now(&td->start);
@@
-1510,7
+1511,7
@@
static bool check_get_trim(struct thread_data *td, struct io_u *io_u)
get_trim = 1;
}
get_trim = 1;
}
- if (get_trim &&
!
get_next_trim(td, io_u))
+ if (get_trim && get_next_trim(td, io_u))
return true;
}
return true;
}