#define DEF_FILE_SIZE (1024 * 1024 * 1024UL)
#define DEF_ZONE_SIZE (0)
#define DEF_ZONE_SKIP (0)
+#define DEF_RWMIX_CYCLE (500)
+#define DEF_RWMIX_READ (50)
+#define DEF_NICE (0)
-static char fio_version_string[] = "fio 1.3";
+static char fio_version_string[] = "fio 1.4";
static int repeatable = DEF_RAND_REPEAT;
static char *ini_file;
}
if (td->filetype == FIO_TYPE_FILE) {
- if (td->directory[0] != '\0')
+ if (td->directory && td->directory[0] != '\0')
sprintf(td->file_name, "%s/%s.%d", td->directory, jobname, td->jobnum);
else
sprintf(td->file_name, "%s.%d", jobname, td->jobnum);
int init_random_state(struct thread_data *td)
{
- unsigned long seed;
+ unsigned long seeds[4];
int fd, num_maps, blocks;
fd = open("/dev/urandom", O_RDONLY);
return 1;
}
- if (read(fd, &seed, sizeof(seed)) < (int) sizeof(seed)) {
+ if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
td_verror(td, EIO);
close(fd);
return 1;
close(fd);
- srand48_r(seed, &td->bsrange_state);
- srand48_r(seed, &td->verify_state);
+ srand48_r(seeds[0], &td->bsrange_state);
+ srand48_r(seeds[1], &td->verify_state);
+ srand48_r(seeds[2], &td->rwmix_state);
if (td->sequential)
return 0;
if (repeatable)
- seed = DEF_RANDSEED;
+ seeds[3] = DEF_RANDSEED;
blocks = (td->io_size + td->min_bs - 1) / td->min_bs;
num_maps = blocks / BLOCKS_PER_MAP;
td->num_maps = num_maps;
memset(td->file_map, 0, num_maps * sizeof(long));
- srand48_r(seed, &td->random_state);
+ srand48_r(seeds[3], &td->random_state);
return 0;
}
static int str_iolog_cb(struct thread_data *td, char *file)
{
- strncpy(td->iolog_file, file, sizeof(td->iolog_file) - 1);
+ td->iolog_file = strdup(file);
+ return 0;
+}
+
+static int str_prerun_cb(struct thread_data *td, char *file)
+{
+ td->exec_prerun = strdup(file);
+ return 0;
+}
+
+static int str_postrun_cb(struct thread_data *td, char *file)
+{
+ td->exec_postrun = strdup(file);
+ return 0;
+}
+
+static int str_iosched_cb(struct thread_data *td, char *file)
+{
+ td->ioscheduler = strdup(file);
return 0;
}
int parse_jobs_ini(char *file)
{
- unsigned int prioclass, prio, cpu, global;
+ unsigned int prioclass, prio, cpu, global, il;
unsigned long long ull;
unsigned long ul1, ul2;
struct thread_data *td;
- char *string, *name;
+ char *string, *name, *tmpbuf;
fpos_t off;
FILE *f;
char *p;
string = malloc(4096);
name = malloc(256);
+ tmpbuf = malloc(4096);
while ((p = fgets(string, 4096, f)) != NULL) {
if (is_empty_or_comment(p))
fgetpos(f, &off);
continue;
}
+ if (!check_int(p, "rwmixcycle", &td->rwmixcycle)) {
+ fgetpos(f, &off);
+ continue;
+ }
+ if (!check_int(p, "rwmixread", &il)) {
+ if (il > 100)
+ il = 100;
+ td->rwmixread = il;
+ fgetpos(f, &off);
+ continue;
+ }
+ if (!check_int(p, "rwmixwrite", &il)) {
+ if (il > 100)
+ il = 100;
+ td->rwmixread = 100 - il;
+ fgetpos(f, &off);
+ continue;
+ }
+ if (!check_int(p, "nice", &td->nice)) {
+ fgetpos(f, &off);
+ continue;
+ }
if (!check_range(p, "bsrange", &ul1, &ul2)) {
if (ul1 > ul2) {
td->max_bs = ul1;
fgetpos(f, &off);
continue;
}
- if (!check_strstore(p, "directory", td->directory)) {
+ if (!check_strstore(p, "directory", tmpbuf)) {
+ td->directory = strdup(tmpbuf);
fgetpos(f, &off);
continue;
}
continue;
}
if (!check_str(p, "iolog", str_iolog_cb, td)) {
- printf("got read iolog\n");
td->read_iolog = 1;
td->write_iolog = 0;
fgetpos(f, &off);
}
if (!td->read_iolog &&
!check_str(p, "write_iolog", str_iolog_cb, td)) {
- printf("got write iolog\n");
td->write_iolog = 1;
fgetpos(f, &off);
continue;
}
+ if (!check_str(p, "exec_prerun", str_prerun_cb, td)) {
+ fgetpos(f, &off);
+ continue;
+ }
+ if (!check_str(p, "exec_postrun", str_postrun_cb, td)) {
+ fgetpos(f, &off);
+ continue;
+ }
+ if (!check_str(p, "ioscheduler", str_iosched_cb, td)) {
+ fgetpos(f, &off);
+ continue;
+ }
printf("Client%d: bad option %s\n",td->thread_number,p);
return 1;
free(string);
free(name);
+ free(tmpbuf);
fclose(f);
return 0;
}
def_thread.stonewall = DEF_STONEWALL;
def_thread.numjobs = DEF_NUMJOBS;
def_thread.use_thread = DEF_USE_THREAD;
+ def_thread.rwmixcycle = DEF_RWMIX_CYCLE;
+ def_thread.rwmixread = DEF_RWMIX_READ;
+ def_thread.nice = DEF_NICE;
#ifdef FIO_HAVE_DISK_UTIL
def_thread.do_disk_util = 1;
#endif