projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pointer -> int conversion warning
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 56df3c7582e91ce2f419709672d550d1b3d5173c..bbd0675861be4d55ad336f1b78f540dbaeeadd62 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-30,6
+30,7
@@
static int str_prioclass_cb(void *, unsigned int *);
#endif
static int str_exitall_cb(void);
static int str_cpumask_cb(void *, unsigned int *);
#endif
static int str_exitall_cb(void);
static int str_cpumask_cb(void *, unsigned int *);
+static int str_fst_cb(void *, const char *);
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
@@
-102,6
+103,7
@@
static struct fio_option options[] = {
#ifdef FIO_HAVE_SYSLET
{ .ival = "syslet-rw", },
#endif
#ifdef FIO_HAVE_SYSLET
{ .ival = "syslet-rw", },
#endif
+ { .ival = "cpuio", },
{ .ival = "external", },
},
},
{ .ival = "external", },
},
},
@@
-189,6
+191,7
@@
static struct fio_option options[] = {
{
.name = "file_service_type",
.type = FIO_OPT_STR,
{
.name = "file_service_type",
.type = FIO_OPT_STR,
+ .cb = str_fst_cb,
.off1 = td_var_offset(file_service_type),
.help = "How to select which file to service next",
.def = "roundrobin",
.off1 = td_var_offset(file_service_type),
.help = "How to select which file to service next",
.def = "roundrobin",
@@
-474,7
+477,8
@@
static struct fio_option options[] = {
.name = "cpuchunks",
.type = FIO_OPT_INT,
.off1 = td_var_offset(cpucycle),
.name = "cpuchunks",
.type = FIO_OPT_INT,
.off1 = td_var_offset(cpucycle),
- .help = "Length of the CPU burn cycles",
+ .help = "Length of the CPU burn cycles (usecs)",
+ .def = "50000",
},
#ifdef FIO_HAVE_CPU_AFFINITY
{
},
#ifdef FIO_HAVE_CPU_AFFINITY
{
@@
-800,6
+804,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
int numjobs, i;
struct fio_file *f;
const char *engine;
int numjobs, i;
struct fio_file *f;
const char *engine;
+ int fn_given;
/*
* the def_thread is just for options, it's not a real job
/*
* the def_thread is just for options, it's not a real job
@@
-814,11
+819,20
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
return 1;
}
return 1;
}
+ if (td->use_thread)
+ nr_thread++;
+ else
+ nr_process++;
+
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
+ fn_given = (long) td->filename;
+ if (!td->filename)
+ td->filename = strdup(jobname);
+
td->filetype = FIO_TYPE_FILE;
td->filetype = FIO_TYPE_FILE;
- if (
td->filename &&
!lstat(td->filename, &sb)) {
+ if (!lstat(td->filename, &sb)) {
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
@@
-827,12
+841,12
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
fixup_options(td);
fixup_options(td);
- if (
td->filename
)
+ if (
fn_given
)
td->nr_uniq_files = 1;
else
td->nr_uniq_files = td->open_files;
td->nr_uniq_files = 1;
else
td->nr_uniq_files = td->open_files;
- if (td->filetype == FIO_TYPE_FILE
|| td->filename
) {
+ if (td->filetype == FIO_TYPE_FILE) {
char tmp[PATH_MAX];
int len = 0;
char tmp[PATH_MAX];
int len = 0;
@@
-855,10
+869,10
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
memset(f, 0, sizeof(*f));
f->fd = -1;
memset(f, 0, sizeof(*f));
f->fd = -1;
- if (
td->filename
)
+ if (
fn_given
)
sprintf(tmp + len, "%s", td->filename);
else
sprintf(tmp + len, "%s", td->filename);
else
- sprintf(tmp + len, "%s.%d.%d",
job
name, td->thread_number, i);
+ sprintf(tmp + len, "%s.%d.%d",
td->file
name, td->thread_number, i);
f->file_name = strdup(tmp);
}
} else {
f->file_name = strdup(tmp);
}
} else {
@@
-902,7
+916,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (!terse_output) {
if (!job_add_num) {
if (!terse_output) {
if (!job_add_num) {
- if (
td->io_ops->flags & FIO_CPUIO
)
+ if (
!strcmp(td->io_ops->name, "cpuio")
)
fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
else {
char *c1, *c2, *c3, *c4;
fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
else {
char *c1, *c2, *c3, *c4;
@@
-957,7
+971,7
@@
int init_random_state(struct thread_data *td)
int fd, num_maps, blocks, i;
struct fio_file *f;
int fd, num_maps, blocks, i;
struct fio_file *f;
- if (td->io_ops->flags & FIO_
CPU
IO)
+ if (td->io_ops->flags & FIO_
DISKLESS
IO)
return 0;
fd = open("/dev/urandom", O_RDONLY);
return 0;
fd = open("/dev/urandom", O_RDONLY);
@@
-992,6
+1006,10
@@
int init_random_state(struct thread_data *td)
blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
f->file_map = malloc(num_maps * sizeof(long));
blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
f->file_map = malloc(num_maps * sizeof(long));
+ if (!f->file_map) {
+ log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+ return 1;
+ }
f->num_maps = num_maps;
memset(f->file_map, 0, num_maps * sizeof(long));
}
f->num_maps = num_maps;
memset(f->file_map, 0, num_maps * sizeof(long));
}
@@
-1034,7
+1052,7
@@
static int is_empty_or_comment(char *line)
/*
* Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
*/
/*
* Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
*/
-static char *get_
mmap_file
(const char *str)
+static char *get_
opt_postfix
(const char *str)
{
char *p = strstr(str, ":");
{
char *p = strstr(str, ":");
@@
-1052,7
+1070,7
@@
static int str_mem_cb(void *data, const char *mem)
struct thread_data *td = data;
if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
struct thread_data *td = data;
if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
- td->mmapfile = get_
mmap_file
(mem);
+ td->mmapfile = get_
opt_postfix
(mem);
if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
log_err("fio: mmaphuge:/path/to/file\n");
return 1;
if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
log_err("fio: mmaphuge:/path/to/file\n");
return 1;
@@
-1100,6
+1118,18
@@
static int str_cpumask_cb(void *data, unsigned int *val)
return 0;
}
return 0;
}
+static int str_fst_cb(void *data, const char *str)
+{
+ struct thread_data *td = data;
+ char *nr = get_opt_postfix(str);
+
+ td->file_service_nr = 1;
+ if (nr)
+ td->file_service_nr = atoi(nr);
+
+ return 0;
+}
+
/*
* This is our [ini] type file parser.
*/
/*
* This is our [ini] type file parser.
*/