The following changes since commit 44583e022320424d145dbf01d51480e4c9a71126:
Fixup commit error in 56c796 (2013-03-18 15:34:41 -0600)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (3):
A few ULL -> uint64_t conversions
Fix re-run issue when job size is set to "unknown"
lib/getopt_long: clear 'optarg' every time
backend.c | 2 +-
fio.h | 18 +++++++++---------
lib/getopt_long.c | 2 ++
3 files changed, 12 insertions(+), 10 deletions(-)
---
Diff of recent changes:
diff --git a/backend.c b/backend.c
index e482fb8..3567990 100644
--- a/backend.c
+++ b/backend.c
@@ -1034,7 +1034,7 @@ static int keep_running(struct thread_data *td)
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;
/*
diff --git a/fio.h b/fio.h
index d7eb6de..c42c4e1 100644
--- a/fio.h
+++ b/fio.h
@@ -454,22 +454,22 @@ struct thread_data {
/*
* Rate state
*/
- unsigned long long rate_bps[DDIR_RWDIR_CNT];
+ uint64_t rate_bps[DDIR_RWDIR_CNT];
long rate_pending_usleep[DDIR_RWDIR_CNT];
unsigned long rate_bytes[DDIR_RWDIR_CNT];
unsigned long rate_blocks[DDIR_RWDIR_CNT];
struct timeval lastrate[DDIR_RWDIR_CNT];
- unsigned long long total_io_size;
- unsigned long long fill_device_size;
+ uint64_t total_io_size;
+ uint64_t fill_device_size;
unsigned long io_issues[DDIR_RWDIR_CNT];
- unsigned long long io_blocks[DDIR_RWDIR_CNT];
- unsigned long long this_io_blocks[DDIR_RWDIR_CNT];
- unsigned long long io_bytes[DDIR_RWDIR_CNT];
- unsigned long long io_skip_bytes;
- unsigned long long this_io_bytes[DDIR_RWDIR_CNT];
- unsigned long long zone_bytes;
+ uint64_t io_blocks[DDIR_RWDIR_CNT];
+ uint64_t this_io_blocks[DDIR_RWDIR_CNT];
+ uint64_t io_bytes[DDIR_RWDIR_CNT];
+ uint64_t io_skip_bytes;
+ uint64_t this_io_bytes[DDIR_RWDIR_CNT];
+ uint64_t zone_bytes;
struct fio_mutex *mutex;
/*
diff --git a/lib/getopt_long.c b/lib/getopt_long.c
index bdd524b..11d879a 100644
--- a/lib/getopt_long.c
+++ b/lib/getopt_long.c
@@ -46,6 +46,8 @@ int getopt_long_only(int argc, char *const *argv, const char *optstring,
const char *osptr;
int opt;
+ optarg = NULL;
+
/* getopt() relies on a number of different global state
variables, which can make this really confusing if there is
more than one use of getopt() in the same program. This
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
