The following changes since commit a6294434450db2728f1253ec6b6d2f57ef864b94:
Correct check to o->numjobs > 1 for verify warning (2011-01-17 16:51:46 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (2):
Ensure that short command line options work
Multiple jobs and verify will not fail if do_verify=0
init.c | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
---
Diff of recent changes:
diff --git a/init.c b/init.c
index dcb0193..15adf38 100644
--- a/init.c
+++ b/init.c
@@ -55,6 +55,8 @@ unsigned long fio_debug = 0;
unsigned int fio_debug_jobno = -1;
unsigned int *fio_debug_jobp = NULL;
+static char cmd_optstr[256];
+
/*
* Command line options. These will contain the above, plus a few
* extra that only pertain to fio itself and not jobs.
@@ -379,7 +381,7 @@ static int fixup_options(struct thread_data *td)
"pre-populated the file\n");
ret = warnings_fatal;
}
- if (td_write(td) && o->numjobs > 1) {
+ if (td_write(td) && o->do_verify && o->numjobs > 1) {
log_info("Multiple writers may overwrite blocks that "
"belong to other jobs. This can cause "
"verification failures.\n");
@@ -1093,12 +1095,32 @@ static int set_debug(const char *string)
}
#endif
+static void fio_options_fill_optstring(void)
+{
+ char *ostr = cmd_optstr;
+ int i, c;
+
+ c = i = 0;
+ while (l_opts[i].name) {
+ ostr[c++] = l_opts[i].val;
+ if (l_opts[i].has_arg == required_argument)
+ ostr[c++] = ':';
+ else if (l_opts[i].has_arg == optional_argument) {
+ ostr[c++] = ':';
+ ostr[c++] = ':';
+ }
+ i++;
+ }
+ ostr[c] = '\0';
+}
+
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
+ char *ostr = cmd_optstr;
- while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
+ while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
switch (c) {
case 'a':
smalloc_pool_size = atoi(optarg);
@@ -1231,6 +1253,7 @@ int parse_options(int argc, char *argv[])
log_info("%s\n", fio_version_string);
+ fio_options_fill_optstring();
fio_options_dup_and_init(l_opts);
if (setup_thread_area())
--
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
