Fix wrong time conversion on --status-interval= command line option

[fio.git] / init.c

diff --git a/init.c b/init.c
index 7f8b3178ebd26f36e47c434dbcf035a6b8ceac28..adb9066b14a86631e0019967889863c091f0b2ac 100644 (file)
--- a/init.c
+++ b/init.c
@@ -43,6 +43,7 @@ struct thread_data *threads = NULL;
 
 int exitall_on_terminate = 0;
 int output_format = FIO_OUTPUT_NORMAL;
+int append_terse_output = 0;
 int eta_print = FIO_ETA_AUTO;
 int eta_new_line = 0;
 FILE *f_out = NULL;
@@ -108,6 +109,11 @@ static struct option l_opts[FIO_NR_OPTIONS] = {
                .has_arg        = optional_argument,
                .val            = 'F' | FIO_CLIENT_FLAG,
        },
+       {
+               .name           = (char *) "append-terse",
+               .has_arg        = optional_argument,
+               .val            = 'f',
+       },
        {
                .name           = (char *) "version",
                .has_arg        = no_argument,
@@ -670,6 +676,11 @@ static int fixup_options(struct thread_data *td)
        if (td->o.rand_seed)
                td->o.rand_repeatable = 0;
 
+       if ((td->io_ops->flags & FIO_NOEXTEND) && td->o.file_append) {
+               log_err("fio: can't append/extent with IO engine %s\n", td->io_ops->name);
+               ret = 1;
+       }
+
        return ret;
 }
 
@@ -1020,10 +1031,10 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
                file_alloced = 1;
 
                if (o->nr_files == 1 && exists_and_not_file(jobname))
-                       add_file(td, jobname, job_add_num);
+                       add_file(td, jobname, job_add_num, 0);
                else {
                        for (i = 0; i < o->nr_files; i++)
-                               add_file(td, make_filename(fname, o, jobname, job_add_num, i), job_add_num);
+                               add_file(td, make_filename(fname, o, jobname, job_add_num, i), job_add_num, 0);
                }
        }
 
@@ -1716,6 +1727,9 @@ int parse_cmd_line(int argc, char *argv[], int client_type)
                        else
                                output_format = FIO_OUTPUT_NORMAL;
                        break;
+               case 'f':
+                       append_terse_output = 1;
+                       break;
                case 'h':
                        if (!cur_client) {
                                usage(argv[0]);
@@ -1764,7 +1778,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type)
                case 'E': {
                        long long t = 0;
 
-                       if (str_to_decimal(optarg, &t, 0, NULL)) {
+                       if (str_to_decimal(optarg, &t, 0, NULL, 1)) {
                                log_err("fio: failed parsing eta time %s\n", optarg);
                                exit_val = 1;
                                do_exit++;
@@ -1924,7 +1938,7 @@ int parse_cmd_line(int argc, char *argv[], int client_type)
                case 'L': {
                        long long val;
 
-                       if (check_str_time(optarg, &val)) {
+                       if (check_str_time(optarg, &val, 0)) {
                                log_err("fio: failed parsing time %s\n", optarg);
                                do_exit++;
                                exit_val = 1;