projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix timout variable setting
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 40fcf1c35f61a5426648ee19dcfa9f680147bcf1..81674aa4b5f6425af0188b9542bdacb088bd442f 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-1,3
+1,7
@@
+/*
+ * This file contains the ini and command liner parser. It will create
+ * and initialize the specified jobs.
+ */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@
-12,6
+16,9
@@
#include "fio.h"
#include "fio.h"
+/*
+ * The default options
+ */
#define DEF_BS (4096)
#define DEF_TIMEOUT (0)
#define DEF_RATE_CYCLE (1000)
#define DEF_BS (4096)
#define DEF_TIMEOUT (0)
#define DEF_RATE_CYCLE (1000)
@@
-42,7
+49,7
@@
static int def_timeout = DEF_TIMEOUT;
static int def_timeout = DEF_TIMEOUT;
-static char fio_version_string[] = "fio 1.
4
";
+static char fio_version_string[] = "fio 1.
5
";
static char **ini_file;
static int max_jobs = MAX_JOBS;
static char **ini_file;
static int max_jobs = MAX_JOBS;
@@
-59,6
+66,9
@@
unsigned long long mlock_size = 0;
FILE *f_out = NULL;
FILE *f_err = NULL;
FILE *f_out = NULL;
FILE *f_err = NULL;
+/*
+ * Return a free job structure.
+ */
static struct thread_data *get_new_job(int global, struct thread_data *parent)
{
struct thread_data *td;
static struct thread_data *get_new_job(int global, struct thread_data *parent)
{
struct thread_data *td;
@@
-83,6
+93,11
@@
static void put_job(struct thread_data *td)
thread_number--;
}
thread_number--;
}
+/*
+ * Adds a job to the list of things todo. Sanitizes the various options
+ * to make sure we don't have conflicts, and initializes various
+ * members of td.
+ */
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
{
char *ddir_str[] = { "read", "write", "randread", "randwrite",
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
{
char *ddir_str[] = { "read", "write", "randread", "randwrite",
@@
-122,6
+137,12
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (td->zone_size && !td->sequential)
td->zone_size = 0;
if (td->zone_size && !td->sequential)
td->zone_size = 0;
+ /*
+ * Reads can do overwrites, we always need to pre-create the file
+ */
+ if (td_read(td) || td_rw(td))
+ td->overwrite = 1;
+
td->filetype = FIO_TYPE_FILE;
if (!stat(jobname, &sb)) {
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_FILE;
if (!stat(jobname, &sb)) {
if (S_ISBLK(sb.st_mode))
@@
-205,6
+226,10
@@
err:
return -1;
}
return -1;
}
+/*
+ * Initialize the various random states we need (random io, block size ranges,
+ * read/write mix, etc).
+ */
int init_random_state(struct thread_data *td)
{
unsigned long seeds[4];
int init_random_state(struct thread_data *td)
{
unsigned long seeds[4];
@@
-258,7
+283,24
@@
static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
#endif
}
#endif
}
-static unsigned long get_mult(char c)
+static unsigned long get_mult_time(char c)
+{
+ switch (c) {
+ case 'm':
+ case 'M':
+ return 60;
+ case 'h':
+ case 'H':
+ return 60 * 60;
+ case 'd':
+ case 'D':
+ return 24 * 60 * 60;
+ default:
+ return 1;
+ }
+}
+
+static unsigned long get_mult_bytes(char c)
{
switch (c) {
case 'k':
{
switch (c) {
case 'k':
@@
-278,7
+320,7
@@
static unsigned long get_mult(char c)
/*
* convert string after '=' into decimal value, noting any size suffix
*/
/*
* convert string after '=' into decimal value, noting any size suffix
*/
-static int str_
cnv(char *p, unsigned long long *val
)
+static int str_
to_decimal(char *p, unsigned long long *val, int kilo
)
{
char *str;
int len;
{
char *str;
int len;
@@
-294,16
+336,27
@@
static int str_cnv(char *p, unsigned long long *val)
if (*val == ULONG_MAX && errno == ERANGE)
return 1;
if (*val == ULONG_MAX && errno == ERANGE)
return 1;
- *val *= get_mult(str[len - 1]);
+ if (kilo)
+ *val *= get_mult_bytes(str[len - 1]);
+ else
+ *val *= get_mult_time(str[len - 1]);
return 0;
}
return 0;
}
-static int check_strcnv(char *p, char *name, unsigned long long *val)
+static int check_str_bytes(char *p, char *name, unsigned long long *val)
+{
+ if (strncmp(p, name, strlen(name) - 1))
+ return 1;
+
+ return str_to_decimal(p, val, 1);
+}
+
+static int check_str_time(char *p, char *name, unsigned long long *val)
{
if (strncmp(p, name, strlen(name) - 1))
return 1;
{
if (strncmp(p, name, strlen(name) - 1))
return 1;
- return str_
cnv(p, val
);
+ return str_
to_decimal(p, val, 0
);
}
static void strip_blank_front(char **p)
}
static void strip_blank_front(char **p)
@@
-368,12
+421,12
@@
static int check_strstore(char *p, char *name, char *dest)
return 0;
}
return 0;
}
-static int __check_range(char *str, unsigned long *val)
+static int __check_range
_bytes
(char *str, unsigned long *val)
{
char suffix;
if (sscanf(str, "%lu%c", val, &suffix) == 2) {
{
char suffix;
if (sscanf(str, "%lu%c", val, &suffix) == 2) {
- *val *= get_mult(suffix);
+ *val *= get_mult
_bytes
(suffix);
return 0;
}
return 0;
}
@@
-383,7
+436,8
@@
static int __check_range(char *str, unsigned long *val)
return 1;
}
return 1;
}
-static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
+static int check_range_bytes(char *p, char *name, unsigned long *s,
+ unsigned long *e)
{
char option[128];
char *str, *p1, *p2;
{
char option[128];
char *str, *p1, *p2;
@@
-419,7
+473,7
@@
static int check_range(char *p, char *name, unsigned long *s, unsigned long *e)
p2 = p + 1;
*p = '\0';
p2 = p + 1;
*p = '\0';
- if (!__check_range
(p1, s) && !__check_range
(p2, e))
+ if (!__check_range
_bytes(p1, s) && !__check_range_bytes
(p2, e))
return 0;
return 1;
return 0;
return 1;
@@
-571,7
+625,7
@@
static int str_ioengine_cb(struct thread_data *td, char *str)
/*
* This is our [ini] type file parser.
*/
/*
* This is our [ini] type file parser.
*/
-int parse_jobs_ini(char *file)
+int parse_jobs_ini(char *file
, int stonewall_flag
)
{
unsigned int prioclass, prio, cpu, global, il;
unsigned long long ull;
{
unsigned int prioclass, prio, cpu, global, il;
unsigned long long ull;
@@
-581,7
+635,7
@@
int parse_jobs_ini(char *file)
fpos_t off;
FILE *f;
char *p;
fpos_t off;
FILE *f;
char *p;
- int ret = 0, stonewall
= 1
;
+ int ret = 0, stonewall;
f = fopen(file, "r");
if (!f) {
f = fopen(file, "r");
if (!f) {
@@
-593,6
+647,7
@@
int parse_jobs_ini(char *file)
name = malloc(256);
tmpbuf = malloc(4096);
name = malloc(256);
tmpbuf = malloc(4096);
+ stonewall = stonewall_flag;
while ((p = fgets(string, 4096, f)) != NULL) {
if (ret)
break;
while ((p = fgets(string, 4096, f)) != NULL) {
if (ret)
break;
@@
-694,7
+749,8
@@
int parse_jobs_ini(char *file)
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
- if (!check_int(p, "timeout", &td->timeout)) {
+ if (!check_str_time(p, "timeout", &ull)) {
+ td->timeout = ull;
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
@@
-766,7
+822,7
@@
int parse_jobs_ini(char *file)
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
- if (!check_range(p, "bsrange", &ul1, &ul2)) {
+ if (!check_range
_bytes
(p, "bsrange", &ul1, &ul2)) {
if (ul1 > ul2) {
td->max_bs = ul1;
td->min_bs = ul2;
if (ul1 > ul2) {
td->max_bs = ul1;
td->min_bs = ul2;
@@
-777,28
+833,28
@@
int parse_jobs_ini(char *file)
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
- if (!check_str
cnv
(p, "bs", &ull)) {
+ if (!check_str
_bytes
(p, "bs", &ull)) {
td->bs = ull;
fgetpos(f, &off);
continue;
}
td->bs = ull;
fgetpos(f, &off);
continue;
}
- if (!check_str
cnv
(p, "size", &td->file_size)) {
+ if (!check_str
_bytes
(p, "size", &td->file_size)) {
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
- if (!check_str
cnv
(p, "offset", &td->file_offset)) {
+ if (!check_str
_bytes
(p, "offset", &td->file_offset)) {
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
- if (!check_str
cnv
(p, "zonesize", &td->zone_size)) {
+ if (!check_str
_bytes
(p, "zonesize", &td->zone_size)) {
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
- if (!check_str
cnv
(p, "zoneskip", &td->zone_skip)) {
+ if (!check_str
_bytes
(p, "zoneskip", &td->zone_skip)) {
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
- if (!check_str
cnv
(p, "lockmem", &mlock_size)) {
+ if (!check_str
_bytes
(p, "lockmem", &mlock_size)) {
fgetpos(f, &off);
continue;
}
fgetpos(f, &off);
continue;
}
@@
-977,18
+1033,12
@@
static int parse_cmd_line(int argc, char *argv[])
{
int c, idx = 1, ini_idx = 0;
{
int c, idx = 1, ini_idx = 0;
- while ((c = getopt(argc, argv, "t:o:
f:
lwvhm")) != EOF) {
+ while ((c = getopt(argc, argv, "t:o:lwvhm")) != EOF) {
switch (c) {
case 't':
def_timeout = atoi(optarg);
idx++;
break;
switch (c) {
case 't':
def_timeout = atoi(optarg);
idx++;
break;
- case 'f':
- ini_idx++;
- ini_file = realloc(ini_file, ini_idx * sizeof(char *));
- ini_file[ini_idx - 1] = strdup(optarg);
- idx++;
- break;
case 'l':
write_lat_log = 1;
idx++;
case 'l':
write_lat_log = 1;
idx++;
@@
-1045,6
+1095,11
@@
static void free_shm(void)
}
}
}
}
+/*
+ * 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.
+ */
static int setup_thread_area(void)
{
/*
static int setup_thread_area(void)
{
/*
@@
-1052,9
+1107,9
@@
static int setup_thread_area(void)
* we get a failure that looks like too large a shm segment
*/
do {
* we get a failure that looks like too large a shm segment
*/
do {
-
int s
= max_jobs * sizeof(struct thread_data);
+
size_t size
= max_jobs * sizeof(struct thread_data);
- shm_id = shmget(0, s, IPC_CREAT | 0600);
+ shm_id = shmget(0, s
ize
, IPC_CREAT | 0600);
if (shm_id != -1)
break;
if (errno != EINVAL) {
if (shm_id != -1)
break;
if (errno != EINVAL) {
@@
-1097,7
+1152,7
@@
int parse_options(int argc, char *argv[])
for (i = 0; i < job_files; i++) {
if (fill_def_thread())
return 1;
for (i = 0; i < job_files; i++) {
if (fill_def_thread())
return 1;
- if (parse_jobs_ini(ini_file[i]))
+ if (parse_jobs_ini(ini_file[i]
, i
))
return 1;
free(ini_file[i]);
}
return 1;
free(ini_file[i]);
}