projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add sample crc64 checksum
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 4fd41b7dff1d14825df5fa95230b284dffeb4dd9..2514d90c53ce43d82d4029e804a9609a4e1eddf5 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-17,12
+17,13
@@
#include "fio.h"
#include "parse.h"
#include "fio.h"
#include "parse.h"
-static char fio_version_string[] = "fio 1.1
5
";
+static char fio_version_string[] = "fio 1.1
6.9
";
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
static int max_jobs = MAX_JOBS;
#define FIO_RANDSEED (0xb1899bedUL)
static char **ini_file;
static int max_jobs = MAX_JOBS;
+static int dump_cmdline;
struct thread_data def_thread;
struct thread_data *threads = NULL;
struct thread_data def_thread;
struct thread_data *threads = NULL;
@@
-85,6
+86,11
@@
static struct option long_options[FIO_NR_OPTIONS] = {
.has_arg = optional_argument,
.val = 'c',
},
.has_arg = optional_argument,
.val = 'c',
},
+ {
+ .name = "showcmd",
+ .has_arg = no_argument,
+ .val = 's'
+ },
{
.name = NULL,
},
{
.name = NULL,
},
@@
-216,9
+222,6
@@
static int fixup_options(struct thread_data *td)
if (!o->file_size_high)
o->file_size_high = o->file_size_low;
if (!o->file_size_high)
o->file_size_high = o->file_size_low;
- if (td_read(td) && !td_rw(td))
- o->verify = 0;
-
if (o->norandommap && o->verify != VERIFY_NONE) {
log_err("fio: norandommap given, verify disabled\n");
o->verify = VERIFY_NONE;
if (o->norandommap && o->verify != VERIFY_NONE) {
log_err("fio: norandommap given, verify disabled\n");
o->verify = VERIFY_NONE;
@@
-268,6
+271,11
@@
static int fixup_options(struct thread_data *td)
return 1;
}
return 1;
}
+ if (!o->timeout && o->time_based) {
+ log_err("fio: time_based requires a runtime/timeout setting\n");
+ o->time_based = 0;
+ }
+
return 0;
}
return 0;
}
@@
-381,6
+389,14
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (td == &def_thread)
return 0;
if (td == &def_thread)
return 0;
+ /*
+ * if we are just dumping the output command line, don't add the job
+ */
+ if (dump_cmdline) {
+ put_job(td);
+ return 0;
+ }
+
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
if (!td->io_ops) {
engine = get_engine_name(td->o.ioengine);
td->io_ops = load_ioengine(td, engine);
if (!td->io_ops) {
@@
-413,6
+429,13
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (fixup_options(td))
goto err;
if (fixup_options(td))
goto err;
+ if (td->io_ops->flags & FIO_DISKLESSIO) {
+ struct fio_file *f;
+
+ for_each_file(td, f, i)
+ f->real_file_size = -1ULL;
+ }
+
td->mutex = fio_sem_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->mutex = fio_sem_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
@@
-529,6
+552,7
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
FILE *f;
char *p;
int ret = 0, stonewall;
FILE *f;
char *p;
int ret = 0, stonewall;
+ int first_sect = 1;
f = fopen(file, "r");
if (!f) {
f = fopen(file, "r");
if (!f) {
@@
-537,8
+561,12
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
}
string = malloc(4096);
}
string = malloc(4096);
- name = malloc(256);
- memset(name, 0, 256);
+
+ /*
+ * it's really 256 + small bit, 280 should suffice
+ */
+ name = malloc(280);
+ memset(name, 0, 280);
stonewall = stonewall_flag;
do {
stonewall = stonewall_flag;
do {
@@
-552,14
+580,22
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
if (is_empty_or_comment(p))
continue;
if (sscanf(p, "[%255s]", name) != 1) {
if (is_empty_or_comment(p))
continue;
if (sscanf(p, "[%255s]", name) != 1) {
- log_err("fio: option <%s> outside of job section\n", p);
-
continue
;
+ log_err("fio: option <%s> outside of
[]
job section\n", p);
+
break
;
}
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
}
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
+ if (dump_cmdline) {
+ if (first_sect)
+ log_info("fio ");
+ if (!global)
+ log_info("--name=%s ", name);
+ first_sect = 0;
+ }
+
td = get_new_job(global, &def_thread);
if (!td) {
ret = 1;
td = get_new_job(global, &def_thread);
if (!td) {
ret = 1;
@@
-594,6
+630,8
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
* easier on the user.
*/
ret |= fio_option_parse(td, p);
* easier on the user.
*/
ret |= fio_option_parse(td, p);
+ if (!ret && dump_cmdline)
+ log_info("--%s ", p);
}
if (!ret) {
}
if (!ret) {
@@
-605,6
+643,9
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
}
} while (!ret);
}
} while (!ret);
+ if (dump_cmdline)
+ log_info("\n");
+
free(string);
free(name);
fclose(f);
free(string);
free(name);
fclose(f);
@@
-615,10
+656,7
@@
static int fill_def_thread(void)
{
memset(&def_thread, 0, sizeof(def_thread));
{
memset(&def_thread, 0, sizeof(def_thread));
- if (fio_getaffinity(getpid(), &def_thread.o.cpumask) == -1) {
- perror("sched_getaffinity");
- return 1;
- }
+ fio_getaffinity(getpid(), &def_thread.o.cpumask);
/*
* fill default options
/*
* fill default options
@@
-629,10
+667,6
@@
static int fill_def_thread(void)
def_thread.o.write_bw_log = write_bw_log;
def_thread.o.write_lat_log = write_lat_log;
def_thread.o.write_bw_log = write_bw_log;
def_thread.o.write_lat_log = write_lat_log;
-#ifdef FIO_HAVE_DISK_UTIL
- def_thread.o.do_disk_util = 1;
-#endif
-
return 0;
}
return 0;
}
@@
-696,6
+730,7
@@
static void usage(void)
printf("\t--version\tPrint version info and exit\n");
printf("\t--help\t\tPrint this page\n");
printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n");
printf("\t--version\tPrint version info and exit\n");
printf("\t--help\t\tPrint this page\n");
printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of them\n");
+ printf("\t--showcmd\tTurn a job file into command line options\n");
}
static int parse_cmd_line(int argc, char *argv[])
}
static int parse_cmd_line(int argc, char *argv[])
@@
-730,6
+765,9
@@
static int parse_cmd_line(int argc, char *argv[])
exit(0);
case 'c':
exit(fio_show_option_help(optarg));
exit(0);
case 'c':
exit(fio_show_option_help(optarg));
+ case 's':
+ dump_cmdline = 1;
+ break;
case 'v':
printf("%s\n", fio_version_string);
exit(0);
case 'v':
printf("%s\n", fio_version_string);
exit(0);
@@
-746,7
+784,11
@@
static int parse_cmd_line(int argc, char *argv[])
td = NULL;
}
if (!td) {
td = NULL;
}
if (!td) {
- int global = !strncmp(val, "global", 6);
+ int global = 0;
+
+ if (strncmp(opt, "name", 4) ||
+ !strncmp(val, "global", 6))
+ global = 1;
td = get_new_job(global, &def_thread);
if (!td)
td = get_new_job(global, &def_thread);
if (!td)
@@
-812,6
+854,9
@@
int parse_options(int argc, char *argv[])
options_mem_free(&def_thread);
if (!thread_number) {
options_mem_free(&def_thread);
if (!thread_number) {
+ if (dump_cmdline)
+ return 0;
+
log_err("No jobs defined(s)\n");
return 1;
}
log_err("No jobs defined(s)\n");
return 1;
}