projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consider the maximum block size difference the minimum for loop exit
[fio.git]
/
backend.c
diff --git
a/backend.c
b/backend.c
index d1fe9641d88ebaa47489fc10a8f039e9443bbc10..ae4216db26c69b8fc23d1494a9f648965b882948 100644
(file)
--- a/
backend.c
+++ b/
backend.c
@@
-34,12
+34,12
@@
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ipc.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/ipc.h>
-#ifndef FIO_NO_HAVE_SHM_H
-#include <sys/shm.h>
-#endif
#include <sys/mman.h>
#include "fio.h"
#include <sys/mman.h>
#include "fio.h"
+#ifndef FIO_NO_HAVE_SHM_H
+#include <sys/shm.h>
+#endif
#include "hash.h"
#include "smalloc.h"
#include "verify.h"
#include "hash.h"
#include "smalloc.h"
#include "verify.h"
@@
-884,8
+884,7
@@
static int init_io_u(struct thread_data *td)
char *p;
max_units = td->o.iodepth;
char *p;
max_units = td->o.iodepth;
- max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
- max_bs = max(td->o.max_bs[DDIR_TRIM], max_bs);
+ max_bs = td_max_bs(td);
min_write = td->o.min_bs[DDIR_WRITE];
td->orig_buffer_size = (unsigned long long) max_bs
* (unsigned long long) max_units;
min_write = td->o.min_bs[DDIR_WRITE];
td->orig_buffer_size = (unsigned long long) max_bs
* (unsigned long long) max_units;
@@
-1034,7
+1033,7
@@
static int keep_running(struct thread_data *td)
return 1;
}
return 1;
}
- if (ddir_rw_sum(td->io_bytes) < td->o.size) {
+ if (
td->o.size != -1ULL &&
ddir_rw_sum(td->io_bytes) < td->o.size) {
uint64_t diff;
/*
uint64_t diff;
/*
@@
-1042,7
+1041,7
@@
static int keep_running(struct thread_data *td)
* are done.
*/
diff = td->o.size - ddir_rw_sum(td->io_bytes);
* are done.
*/
diff = td->o.size - ddir_rw_sum(td->io_bytes);
- if (diff < td
->o.rw_min_bs
)
+ if (diff < td
_max_bs(td)
)
return 0;
return 1;
return 0;
return 1;