Merge branch 'pcpp_epoch_fixing_2' of https://github.com/PCPartPicker/fio

* 'pcpp_epoch_fixing_2' of https://github.com/PCPartPicker/fio:
  Make log_unix_epoch an official alias of log_alternate_epoch
  Record job start time to fix time pain points

diff --combined options.c
index 65b2813c27de2d30c2ef10a1c57b0c68c11af908,95001b4aafdb29b557359899acfe02cbf3b25467..6b2cb53f77b381db1e9fa875ad73f96111ed124c
--- 1/options.c
--- 2/options.c
+++ b/options.c
@@@ -596,21 -596,9 +596,21 @@@ static int str_rw_cb(void *data, const 
        if (!nr)
                return 0;
  
 -      if (td_random(td))
 -              o->ddir_seq_nr = atoi(nr);
 -      else {
 +      if (td_random(td)) {
 +              long long val;
 +
 +              if (str_to_decimal(nr, &val, 1, o, 0, 0)) {
 +                      log_err("fio: randrw postfix parsing failed\n");
 +                      free(nr);
 +                      return 1;
 +              }
 +              if ((val <= 0) || (val > UINT_MAX)) {
 +                      log_err("fio: randrw postfix parsing out of range\n");
 +                      free(nr);
 +                      return 1;
 +              }
 +              o->ddir_seq_nr = (unsigned int) val;
 +      } else {
                long long val;
  
                if (str_to_decimal(nr, &val, 1, o, 0, 0)) {
@@@ -4612,17 -4600,9 +4612,9 @@@ struct fio_option fio_options[FIO_MAX_O
                .help   = "Install libz-dev(el) to get compression support",
        },
  #endif
-       {
-               .name = "log_unix_epoch",
-               .lname = "Log epoch unix",
-               .type = FIO_OPT_BOOL,
-               .off1 = offsetof(struct thread_options, log_unix_epoch),
-               .help = "Use Unix time in log files",
-               .category = FIO_OPT_C_LOG,
-               .group = FIO_OPT_G_INVALID,
-       },
        {
                .name = "log_alternate_epoch",
+               .alias = "log_unix_epoch",
                .lname = "Log epoch alternate",
                .type = FIO_OPT_BOOL,
                .off1 = offsetof(struct thread_options, log_alternate_epoch),
@@@ -4635,7 -4615,7 +4627,7 @@@
                .lname = "Log alternate epoch clock_id",
                .type = FIO_OPT_INT,
                .off1 = offsetof(struct thread_options, log_alternate_epoch_clock_id),
-               .help = "If log_alternate_epoch or log_unix_epoch is true, this option specifies the clock_id from clock_gettime whose epoch should be used. If neither of those is true, this option has no effect. Default value is 0, or CLOCK_REALTIME",
+               .help = "If log_alternate_epoch is true, this option specifies the clock_id from clock_gettime whose epoch should be used. If log_alternate_epoch is false, this option has no effect. Default value is 0, or CLOCK_REALTIME",
                .category = FIO_OPT_C_LOG,
                .group = FIO_OPT_G_INVALID,
        },
@@@ -4964,6 -4944,16 +4956,16 @@@
                .category = FIO_OPT_C_GENERAL,
                .group  = FIO_OPT_G_CLOCK,
        },
+       {
+               .name   = "job_start_clock_id",
+               .lname  = "Job start clock_id",
+               .type   = FIO_OPT_INT,
+               .off1   = offsetof(struct thread_options, job_start_clock_id),
+               .help   = "The clock_id passed to the call to clock_gettime used to record job_start in the json output format. Default is 0, or CLOCK_REALTIME",
+               .verify = gtod_cpu_verify,
+               .category = FIO_OPT_C_GENERAL,
+               .group  = FIO_OPT_G_CLOCK,
+       },
        {
                .name   = "unified_rw_reporting",
                .lname  = "Unified RW Reporting",