Commit c2339039 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov

ioping: always respect explicitly set size

Signed-off-by: default avatarKonstantin Khlebnikov <koct9i@gmail.com>
parent 93b8a549
...@@ -419,7 +419,8 @@ long long interval = 1000000; ...@@ -419,7 +419,8 @@ long long interval = 1000000;
struct timespec interval_ts; struct timespec interval_ts;
long long deadline = 0; long long deadline = 0;
ssize_t size = 1<<12; ssize_t default_size = 1<<12;
ssize_t size = 0;
off_t wsize = 0; off_t wsize = 0;
off_t temp_wsize = 1<<20; off_t temp_wsize = 1<<20;
...@@ -452,7 +453,7 @@ void parse_options(int argc, char **argv) ...@@ -452,7 +453,7 @@ void parse_options(int argc, char **argv)
exit(0); exit(0);
case 'L': case 'L':
randomize = 0; randomize = 0;
size = 1<<18; default_size = 1<<18;
break; break;
case 'R': case 'R':
interval = 0; interval = 0;
...@@ -927,14 +928,17 @@ int main (int argc, char **argv) ...@@ -927,14 +928,17 @@ int main (int argc, char **argv)
interval_ts.tv_sec = interval / 1000000; interval_ts.tv_sec = interval / 1000000;
interval_ts.tv_nsec = (interval % 1000000) * 1000; interval_ts.tv_nsec = (interval % 1000000) * 1000;
if (!size)
size = default_size;
if (size <= 0)
errx(1, "request size must be greather than zero");
if (wsize) if (wsize)
temp_wsize = wsize; temp_wsize = wsize;
else if (size > temp_wsize) else if (size > temp_wsize)
temp_wsize = size; temp_wsize = size;
if (size <= 0)
errx(1, "request size must be greather than zero");
flags = O_RDONLY; flags = O_RDONLY;
#if !defined(HAVE_POSIX_FADVICE) && !defined(HAVE_NOCACHE_IO) #if !defined(HAVE_POSIX_FADVICE) && !defined(HAVE_NOCACHE_IO)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment