#include "profile.h"
#include "server.h"
#include "idletime.h"
+#include "filelock.h"
#include "lib/getopt.h"
#include "lib/strcasestr.h"
+#include "crc/test.h"
+
const char fio_version_string[] = FIO_VERSION;
#define FIO_RANDSEED (0xb1899bedUL)
static struct thread_data def_thread;
struct thread_data *threads = NULL;
+static char **job_sections;
+static int nr_job_sections;
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;
FILE *f_err = NULL;
-char **job_sections = NULL;
-int nr_job_sections = 0;
char *exec_profile = NULL;
int warnings_fatal = 0;
int terse_version = 3;
.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,
}
}
-void free_shm(void)
+static void free_shm(void)
{
if (threads) {
file_hash_exit();
}
options_free(fio_options, &def_thread);
+ fio_filelock_exit();
scleanup();
}
o->min_bs[DDIR_READ] == o->min_bs[DDIR_TRIM];
}
+
+static unsigned long long get_rand_start_delay(struct thread_data *td)
+{
+ unsigned long long delayrange;
+ unsigned long r;
+
+ delayrange = td->o.start_delay_high - td->o.start_delay;
+
+ if (td->o.use_os_rand) {
+ r = os_random_long(&td->delay_state);
+ delayrange = (unsigned long long) ((double) delayrange * (r / (OS_RAND_MAX + 1.0)));
+ } else {
+ r = __rand(&td->__delay_state);
+ delayrange = (unsigned long long) ((double) delayrange * (r / (FRAND_MAX + 1.0)));
+ }
+
+ delayrange += td->o.start_delay;
+ return delayrange;
+}
+
/*
* Lazy way of fixing up options that depend on each other. We could also
* define option callback handlers, but this is easier.
if (!o->file_size_high)
o->file_size_high = o->file_size_low;
+ if (o->start_delay_high)
+ o->start_delay = get_rand_start_delay(td);
+
if (o->norandommap && o->verify != VERIFY_NONE
&& !fixed_block_size(o)) {
log_err("fio: norandommap given for variable block sizes, "
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;
}
os_random_seed(td->rand_seeds[FIO_RAND_FILE_SIZE_OFF], &td->file_size_state);
os_random_seed(td->rand_seeds[FIO_RAND_TRIM_OFF], &td->trim_state);
+ os_random_seed(td->rand_seeds[FIO_RAND_START_DELAY], &td->delay_state);
if (!td_random(td))
return;
init_rand_seed(&td->__file_size_state, td->rand_seeds[FIO_RAND_FILE_SIZE_OFF]);
init_rand_seed(&td->__trim_state, td->rand_seeds[FIO_RAND_TRIM_OFF]);
+ init_rand_seed(&td->__delay_state, td->rand_seeds[FIO_RAND_START_DELAY]);
if (!td_random(td))
return;
void td_fill_rand_seeds(struct thread_data *td)
{
+ if (td->o.allrand_repeatable) {
+ for (int i = 0; i < FIO_RAND_NR_OFFS; i++)
+ td->rand_seeds[i] = FIO_RANDSEED * td->thread_number
+ + i;
+ }
+
if (td->o.use_os_rand)
td_fill_rand_seeds_os(td);
else
file_alloced = 1;
if (o->nr_files == 1 && exists_and_not_file(jobname))
- add_file(td, jobname);
+ 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, td->thread_number, i));
+ add_file(td, make_filename(fname, o, jobname, job_add_num, i), job_add_num, 0);
}
}
if (setup_rate(td))
goto err;
- if (o->lat_log_file) {
+ if (o->lat_log_file || write_lat_log) {
setup_log(&td->lat_log, o->log_avg_msec, IO_LOG_TYPE_LAT);
setup_log(&td->slat_log, o->log_avg_msec, IO_LOG_TYPE_SLAT);
setup_log(&td->clat_log, o->log_avg_msec, IO_LOG_TYPE_CLAT);
}
- if (o->bw_log_file)
+ if (o->bw_log_file || write_bw_log)
setup_log(&td->bw_log, o->log_avg_msec, IO_LOG_TYPE_BW);
if (o->iops_log_file)
setup_log(&td->iops_log, o->log_avg_msec, IO_LOG_TYPE_IOPS);
td_new->o.new_group = 0;
if (file_alloced) {
- td_new->files_index = 0;
- td_new->files_size = 0;
if (td_new->files) {
struct fio_file *f;
for_each_file(td_new, f, i) {
if (f->file_name)
- free(f->file_name);
- free(f);
+ sfree(f->file_name);
+ sfree(f);
}
+ free(td_new->files);
td_new->files = NULL;
}
+ td_new->files_index = 0;
+ td_new->files_size = 0;
if (td_new->o.filename) {
free(td_new->o.filename);
td_new->o.filename = NULL;
}
}
- job_add_num = numjobs - 1;
-
- if (add_job(td_new, jobname, job_add_num, 1, client_type))
+ if (add_job(td_new, jobname, numjobs, 1, client_type))
goto err;
}
return 0;
}
-void parse_cmd_client(void *client, char *opt)
+static void parse_cmd_client(void *client, char *opt)
{
fio_client_add_cmd_option(client, opt);
}
-extern int fio_crctest(const char *);
-
int parse_cmd_line(int argc, char *argv[], int client_type)
{
struct thread_data *td = NULL;
else
output_format = FIO_OUTPUT_NORMAL;
break;
+ case 'f':
+ append_terse_output = 1;
+ break;
case 'h':
if (!cur_client) {
usage(argv[0]);
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++;
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;
if (do_exit && !(is_backend || nr_clients))
exit(exit_val);
- if (nr_clients && fio_clients_connect()) {
- do_exit++;
- exit_val = 1;
- return -1;
- }
+ if (nr_clients && fio_clients_connect())
+ exit(1);
if (is_backend && backend)
return fio_start_server(pid_file);
free(ini_file);
fio_options_free(&def_thread);
+ filesetup_mem_free();
if (!thread_number) {
if (parse_dryrun())
projects / fio.git / blobdiff