projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hook up the file hashing
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index e96b4102e122bde922d7ebb47360bbdabedbe01c..4d336fa3eb6c08888a9cd7d0d2a3394d40b90479 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-16,8
+16,10
@@
#include "fio.h"
#include "parse.h"
#include "fio.h"
#include "parse.h"
+#include "smalloc.h"
+#include "filehash.h"
-static char fio_version_string[] = "fio 1.1
8.1
";
+static char fio_version_string[] = "fio 1.1
9
";
#define FIO_RANDSEED (0xb1899bedUL)
#define FIO_RANDSEED (0xb1899bedUL)
@@
-34,6
+36,7
@@
int eta_print;
unsigned long long mlock_size = 0;
FILE *f_out = NULL;
FILE *f_err = NULL;
unsigned long long mlock_size = 0;
FILE *f_out = NULL;
FILE *f_err = NULL;
+char *job_section = NULL;
int write_bw_log = 0;
int read_only = 0;
int write_bw_log = 0;
int read_only = 0;
@@
-110,6
+113,11
@@
static struct option long_options[FIO_NR_OPTIONS] = {
.has_arg = required_argument,
.val = 'd',
},
.has_arg = required_argument,
.val = 'd',
},
+ {
+ .name = "section",
+ .has_arg = required_argument,
+ .val = 'x',
+ },
{
.name = NULL,
},
{
.name = NULL,
},
@@
-460,7
+468,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
f->real_file_size = -1ULL;
}
f->real_file_size = -1ULL;
}
- td->mutex = fio_
sem
_init(0);
+ td->mutex = fio_
mutex
_init(0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
@@
-548,6
+556,16
@@
err:
return -1;
}
return -1;
}
+static int skip_this_section(const char *name)
+{
+ if (!job_section)
+ return 0;
+ if (!strncmp(name, "global", 6))
+ return 0;
+
+ return strncmp(job_section, name, strlen(job_section));
+}
+
static int is_empty_or_comment(char *line)
{
unsigned int i;
static int is_empty_or_comment(char *line)
{
unsigned int i;
@@
-577,6
+595,7
@@
static int parse_jobs_ini(char *file, int stonewall_flag)
int ret = 0, stonewall;
int first_sect = 1;
int skip_fgets = 0;
int ret = 0, stonewall;
int first_sect = 1;
int skip_fgets = 0;
+ int inside_skip = 0;
if (!strcmp(file, "-"))
f = stdin;
if (!strcmp(file, "-"))
f = stdin;
@@
-615,10
+634,18
@@
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) {
+ if (inside_skip)
+ continue;
log_err("fio: option <%s> outside of [] job section\n", p);
break;
}
log_err("fio: option <%s> outside of [] job section\n", p);
break;
}
+ if (skip_this_section(name)) {
+ inside_skip = 1;
+ continue;
+ } else
+ inside_skip = 0;
+
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
global = !strncmp(name, "global", 6);
name[strlen(name) - 1] = '\0';
@@
-717,15
+744,20
@@
static void free_shm(void)
threads = NULL;
shmctl(shm_id, IPC_RMID, &sbuf);
}
threads = NULL;
shmctl(shm_id, IPC_RMID, &sbuf);
}
+
+ scleanup();
}
/*
* The thread area is shared between the main process and the job
* threads/processes. So setup a shared memory segment that will hold
}
/*
* The thread area is shared between the main process and the job
* threads/processes. So setup a shared memory segment that will hold
- * all the job info.
+ * all the job info. We use the end of the region for keeping track of
+ * open files across jobs, for file sharing.
*/
static int setup_thread_area(void)
{
*/
static int setup_thread_area(void)
{
+ void *hash;
+
/*
* 1024 is too much on some machines, scale max_jobs if
* we get a failure that looks like too large a shm segment
/*
* 1024 is too much on some machines, scale max_jobs if
* we get a failure that looks like too large a shm segment
@@
-733,6
+765,8
@@
static int setup_thread_area(void)
do {
size_t size = max_jobs * sizeof(struct thread_data);
do {
size_t size = max_jobs * sizeof(struct thread_data);
+ size += file_hash_size;
+
shm_id = shmget(0, size, IPC_CREAT | 0600);
if (shm_id != -1)
break;
shm_id = shmget(0, size, IPC_CREAT | 0600);
if (shm_id != -1)
break;
@@
-754,6
+788,8
@@
static int setup_thread_area(void)
}
memset(threads, 0, max_jobs * sizeof(struct thread_data));
}
memset(threads, 0, max_jobs * sizeof(struct thread_data));
+ hash = (void *) threads + max_jobs * sizeof(struct thread_data);
+ file_hash_init(hash);
atexit(free_shm);
return 0;
}
atexit(free_shm);
return 0;
}
@@
-775,6
+811,7
@@
static void usage(const char *name)
printf("\t--eta=when\tWhen ETA estimate should be printed\n");
printf("\t \tMay be \"always\", \"never\" or \"auto\"\n");
printf("\t--readonly\tTurn on safety read-only checks, preventing writes\n");
printf("\t--eta=when\tWhen ETA estimate should be printed\n");
printf("\t \tMay be \"always\", \"never\" or \"auto\"\n");
printf("\t--readonly\tTurn on safety read-only checks, preventing writes\n");
+ printf("\t--section=name\tOnly run specified section in job file\n");
}
#ifdef FIO_INC_DEBUG
}
#ifdef FIO_INC_DEBUG
@@
-785,10
+822,12
@@
struct debug_level debug_levels[] = {
{ .name = "mem", .shift = FD_MEM, },
{ .name = "blktrace", .shift = FD_BLKTRACE },
{ .name = "verify", .shift = FD_VERIFY },
{ .name = "mem", .shift = FD_MEM, },
{ .name = "blktrace", .shift = FD_BLKTRACE },
{ .name = "verify", .shift = FD_VERIFY },
+ { .name = "random", .shift = FD_RANDOM },
+ { .name = "parse", .shift = FD_PARSE },
{ },
};
{ },
};
-static
void
set_debug(const char *string)
+static
int
set_debug(const char *string)
{
struct debug_level *dl;
char *p = (char *) string;
{
struct debug_level *dl;
char *p = (char *) string;
@@
-804,10
+843,10
@@
static void set_debug(const char *string)
log_info("%s,", dl->name);
}
log_info("all\n");
log_info("%s,", dl->name);
}
log_info("all\n");
- return;
+ return
1
;
} else if (!strcmp(string, "all")) {
fio_debug = ~0UL;
} else if (!strcmp(string, "all")) {
fio_debug = ~0UL;
- return;
+ return
0
;
}
while ((opt = strsep(&p, ",")) != NULL) {
}
while ((opt = strsep(&p, ",")) != NULL) {
@@
-826,18
+865,20
@@
static void set_debug(const char *string)
if (!found)
log_err("fio: debug mask %s not found\n", opt);
}
if (!found)
log_err("fio: debug mask %s not found\n", opt);
}
+ return 0;
}
#else
static void set_debug(const char *string)
{
log_err("fio: debug tracing not included in build\n");
}
#else
static void set_debug(const char *string)
{
log_err("fio: debug tracing not included in build\n");
+ return 1;
}
#endif
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
}
#endif
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
- int c, ini_idx = 0, lidx, ret
, dont_add_job = 0, bad_options
= 0;
+ int c, ini_idx = 0, lidx, ret
= 0, do_exit = 0, exit_val
= 0;
while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
switch (c) {
while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
switch (c) {
@@
-882,7
+923,19
@@
static int parse_cmd_line(int argc, char *argv[])
eta_print = FIO_ETA_NEVER;
break;
case 'd':
eta_print = FIO_ETA_NEVER;
break;
case 'd':
- set_debug(optarg);
+ if (set_debug(optarg))
+ do_exit++;
+ break;
+ case 'x':
+ if (!strcmp(optarg, "global")) {
+ log_err("fio: can't use global as only section\n");
+ do_exit++;
+ exit_val = 1;
+ break;
+ }
+ if (job_section)
+ free(job_section);
+ job_section = strdup(optarg);
break;
case FIO_GETOPT_JOB: {
const char *opt = long_options[lidx].name;
break;
case FIO_GETOPT_JOB: {
const char *opt = long_options[lidx].name;
@@
-897,39
+950,38
@@
static int parse_cmd_line(int argc, char *argv[])
td = NULL;
}
if (!td) {
td = NULL;
}
if (!td) {
+ int is_section = !strncmp(opt, "name", 4);
int global = 0;
int global = 0;
- if (strncmp(opt, "name", 4) ||
- !strncmp(val, "global", 6))
+ if (!is_section || !strncmp(val, "global", 6))
global = 1;
global = 1;
+ if (is_section && skip_this_section(val))
+ continue;
+
td = get_new_job(global, &def_thread);
if (!td)
return 0;
}
ret = fio_cmd_option_parse(td, opt, val);
td = get_new_job(global, &def_thread);
if (!td)
return 0;
}
ret = fio_cmd_option_parse(td, opt, val);
- if (ret)
- dont_add_job = 1;
break;
}
default:
break;
}
default:
- bad_options++;
+ do_exit++;
+ exit_val = 1;
break;
}
}
break;
}
}
- if (
bad_options
)
- exit(
1
);
+ if (
do_exit
)
+ exit(
exit_val
);
if (td) {
if (td) {
- if (dont_add_job)
- put_job(td);
- else {
+ if (!ret)
ret = add_job(td, td->o.name ?: "fio", 0);
ret = add_job(td, td->o.name ?: "fio", 0);
- if (ret)
- put_job(td);
- }
+ if (ret)
+ put_job(td);
}
while (optind < argc) {
}
while (optind < argc) {