#include "smalloc.h"
#include "filehash.h"
-static char fio_version_string[] = "fio 1.20-rc3";
+static char fio_version_string[] = "fio 1.26";
#define FIO_RANDSEED (0xb1899bedUL)
static int max_jobs = MAX_JOBS;
static int dump_cmdline;
-struct thread_data def_thread;
+static struct thread_data def_thread;
struct thread_data *threads = NULL;
int exitall_on_terminate = 0;
static int prev_group_jobs;
unsigned long fio_debug = 0;
+unsigned int fio_debug_jobno = -1;
+unsigned int *fio_debug_jobp = NULL;
/*
* Command line options. These will contain the above, plus a few
.has_arg = required_argument,
.val = 'x',
},
+ {
+ .name = "alloc-size",
+ .has_arg = required_argument,
+ .val = 'a',
+ },
{
.name = NULL,
},
return 0;
}
+static int fixed_block_size(struct thread_options *o)
+{
+ return o->min_bs[DDIR_READ] == o->max_bs[DDIR_READ] &&
+ o->min_bs[DDIR_WRITE] == o->max_bs[DDIR_WRITE] &&
+ o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE];
+}
+
/*
* Lazy way of fixing up options that depend on each other. We could also
* define option callback handlers, but this is easier.
{
struct thread_options *o = &td->o;
+#ifndef FIO_HAVE_PSHARED_MUTEX
+ if (!td->o.use_thread) {
+ log_info("fio: this platform does not support process shared"
+ " mutexes, forcing use of threads. Use the 'thread'"
+ " option to get rid of this warning.\n");
+ td->o.use_thread = 1;
+ }
+#endif
+
+#ifndef FIO_HAVE_CPU_AFFINITY
+ if (td->o.gtod_cpu) {
+ log_err("fio: platform must support CPU affinity for"
+ "gettimeofday() offloading\n");
+ return 1;
+ }
+#endif
+
if (read_only && td_write(td)) {
log_err("fio: job <%s> has write bit set, but fio is in"
" read-only mode\n", td->o.name);
return 1;
}
- if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100)
- o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ];
-
if (o->write_iolog_file && o->read_iolog_file) {
log_err("fio: read iolog overrides write_iolog\n");
free(o->write_iolog_file);
o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]);
+ /*
+ * For random IO, allow blockalign offset other than min_bs.
+ */
+ if (!o->ba[DDIR_READ] || !td_random(td))
+ o->ba[DDIR_READ] = o->min_bs[DDIR_READ];
+ if (!o->ba[DDIR_WRITE] || !td_random(td))
+ o->ba[DDIR_WRITE] = o->min_bs[DDIR_WRITE];
+
+ if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] ||
+ o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) &&
+ !td->o.norandommap) {
+ log_err("fio: Any use of blockalign= turns off randommap\n");
+ td->o.norandommap = 1;
+ }
+
if (!o->file_size_high)
o->file_size_high = o->file_size_low;
- if (o->norandommap && o->verify != VERIFY_NONE) {
- log_err("fio: norandommap given, verify disabled\n");
+ if (o->norandommap && o->verify != VERIFY_NONE
+ && !fixed_block_size(o)) {
+ log_err("fio: norandommap given for variable block sizes, "
+ "verify disabled\n");
o->verify = VERIFY_NONE;
}
if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO))
}
if (o->fill_device && !o->size)
- o->size = ULONG_LONG_MAX;
+ o->size = -1ULL;
if (td_rw(td) && td->o.verify != VERIFY_NONE)
log_info("fio: mixed read/write workload with verify. May not "
"work as expected, unless you pre-populated the file\n");
+ if (td->o.verify != VERIFY_NONE)
+ td->o.refill_buffers = 1;
+
return 0;
}
return 1;
}
+void td_fill_rand_seeds(struct thread_data *td)
+{
+ os_random_seed(td->rand_seeds[0], &td->bsrange_state);
+ os_random_seed(td->rand_seeds[1], &td->verify_state);
+ os_random_seed(td->rand_seeds[2], &td->rwmix_state);
+
+ if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
+ os_random_seed(td->rand_seeds[3], &td->next_file_state);
+
+ os_random_seed(td->rand_seeds[5], &td->file_size_state);
+
+ if (!td_random(td))
+ return;
+
+ if (td->o.rand_repeatable)
+ td->rand_seeds[4] = FIO_RANDSEED * td->thread_number;
+
+ os_random_seed(td->rand_seeds[4], &td->random_state);
+}
+
/*
* Initialize the various random states we need (random io, block size ranges,
* read/write mix, etc).
*/
static int init_random_state(struct thread_data *td)
{
- unsigned long seeds[6];
int fd;
fd = open("/dev/urandom", O_RDONLY);
return 1;
}
- if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
+ if (read(fd, td->rand_seeds, sizeof(td->rand_seeds)) <
+ (int) sizeof(td->rand_seeds)) {
td_verror(td, EIO, "read");
close(fd);
return 1;
}
close(fd);
-
- os_random_seed(seeds[0], &td->bsrange_state);
- os_random_seed(seeds[1], &td->verify_state);
- os_random_seed(seeds[2], &td->rwmix_state);
-
- if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
- os_random_seed(seeds[3], &td->next_file_state);
-
- os_random_seed(seeds[5], &td->file_size_state);
-
- if (!td_random(td))
- return 0;
-
- if (td->o.rand_repeatable)
- seeds[4] = FIO_RANDSEED * td->thread_number;
-
- os_random_seed(seeds[4], &td->random_state);
+ td_fill_rand_seeds(td);
return 0;
}
if (file_alloced) {
td_new->o.filename = NULL;
td_new->files_index = 0;
+ td_new->files_size = 0;
td_new->files = NULL;
}
if (!strncmp(name, "global", 6))
return 0;
- return strncmp(job_section, name, strlen(job_section));
+ return strcmp(job_section, name);
}
static int is_empty_or_comment(char *line)
int first_sect = 1;
int skip_fgets = 0;
int inside_skip = 0;
+ char **opts;
+ int i, alloc_opts, num_opts;
if (!strcmp(file, "-"))
f = stdin;
name = malloc(280);
memset(name, 0, 280);
+ alloc_opts = 8;
+ opts = malloc(sizeof(char *) * alloc_opts);
+ num_opts = 0;
+
stonewall = stonewall_flag;
do {
/*
stonewall = 0;
}
+ num_opts = 0;
+ memset(opts, 0, alloc_opts * sizeof(char *));
+
while ((p = fgets(string, 4096, f)) != NULL) {
if (is_empty_or_comment(p))
continue;
strip_blank_end(p);
- /*
- * Don't break here, continue parsing options so we
- * dump all the bad ones. Makes trial/error fixups
- * easier on the user.
- */
- ret |= fio_option_parse(td, p);
- if (!ret && dump_cmdline)
- log_info("--%s ", p);
+ if (num_opts == alloc_opts) {
+ alloc_opts <<= 1;
+ opts = realloc(opts,
+ alloc_opts * sizeof(char *));
+ }
+
+ opts[num_opts] = strdup(p);
+ num_opts++;
}
- if (!ret)
+ ret = fio_options_parse(td, opts, num_opts);
+ if (!ret) {
+ if (dump_cmdline)
+ for (i = 0; i < num_opts; i++)
+ log_info("--%s ", opts[i]);
+
ret = add_job(td, name, 0);
- else {
+ } else {
log_err("fio: job %s dropped\n", name);
put_job(td);
}
+
+ for (i = 0; i < num_opts; i++)
+ free(opts[i]);
+ num_opts = 0;
} while (!ret);
if (dump_cmdline)
log_info("\n");
+ for (i = 0; i < num_opts; i++)
+ free(opts[i]);
+
free(string);
free(name);
+ free(opts);
if (f != stdin)
fclose(f);
return ret;
struct shmid_ds sbuf;
if (threads) {
- shmdt((void *) threads);
+ void *tp = threads;
+
threads = NULL;
+ file_hash_exit();
+ fio_debug_jobp = NULL;
+ shmdt(tp);
shmctl(shm_id, IPC_RMID, &sbuf);
}
size_t size = max_jobs * sizeof(struct thread_data);
size += file_hash_size;
+ size += sizeof(unsigned int);
shm_id = shmget(0, size, IPC_CREAT | 0600);
if (shm_id != -1)
memset(threads, 0, max_jobs * sizeof(struct thread_data));
hash = (void *) threads + max_jobs * sizeof(struct thread_data);
+ fio_debug_jobp = (void *) hash + file_hash_size;
+ *fio_debug_jobp = -1;
file_hash_init(hash);
atexit(free_shm);
return 0;
printf("\t--readonly\tTurn on safety read-only checks, preventing"
" writes\n");
printf("\t--section=name\tOnly run specified section in job file\n");
+ printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
+ " (def 1024)\n");
}
#ifdef FIO_INC_DEBUG
{ .name = "random", .shift = FD_RANDOM },
{ .name = "parse", .shift = FD_PARSE },
{ .name = "diskutil", .shift = FD_DISKUTIL },
- { },
+ { .name = "job", .shift = FD_JOB },
+ { .name = "mutex", .shift = FD_MUTEX },
+ { .name = NULL, },
};
static int set_debug(const char *string)
}
log_info("all\n");
return 1;
- } else if (!strcmp(string, "all")) {
- fio_debug = ~0UL;
- return 0;
}
while ((opt = strsep(&p, ",")) != NULL) {
int found = 0;
+ if (!strncmp(opt, "all", 3)) {
+ log_info("fio: set all debug options\n");
+ fio_debug = ~0UL;
+ continue;
+ }
+
for (i = 0; debug_levels[i].name; i++) {
dl = &debug_levels[i];
- if (!strncmp(opt, dl->name, strlen(opt))) {
+ found = !strncmp(opt, dl->name, strlen(dl->name));
+ if (!found)
+ continue;
+
+ if (dl->shift == FD_JOB) {
+ opt = strchr(opt, ':');
+ if (!opt) {
+ log_err("fio: missing job number\n");
+ break;
+ }
+ opt++;
+ fio_debug_jobno = atoi(opt);
+ log_info("fio: set debug jobno %d\n",
+ fio_debug_jobno);
+ } else {
log_info("fio: set debug option %s\n", opt);
- found = 1;
fio_debug |= (1UL << dl->shift);
- break;
}
+ break;
}
if (!found)
return 0;
}
#else
-static void set_debug(const char *string)
+static int set_debug(const char *string)
{
log_err("fio: debug tracing not included in build\n");
return 1;
while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
switch (c) {
+ case 'a':
+ smalloc_pool_size = atoi(optarg);
+ break;
case 't':
def_timeout = atoi(optarg);
break;
return 1;
}
+ if (def_thread.o.gtod_offload) {
+ fio_gtod_init();
+ fio_gtod_offload = 1;
+ fio_gtod_cpu = def_thread.o.gtod_cpu;
+ }
+
return 0;
}
projects / fio.git / blobdiff