projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Time and seek optimizations
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 54e2ecae28202622d6954308d192439bb55dca2c..badd635a394f45656fc8c027c83a5ad34cea6e6c 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-409,7
+409,7
@@
static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
static int def_timeout = DEF_TIMEOUT;
static int def_timeout = DEF_TIMEOUT;
-static char fio_version_string[] = "fio 1.
8
";
+static char fio_version_string[] = "fio 1.
9
";
static char **ini_file;
static int max_jobs = MAX_JOBS;
static char **ini_file;
static int max_jobs = MAX_JOBS;
@@
-417,7
+417,6
@@
static int max_jobs = MAX_JOBS;
struct thread_data def_thread;
struct thread_data *threads = NULL;
struct thread_data def_thread;
struct thread_data *threads = NULL;
-int rate_quit = 0;
int exitall_on_terminate = 0;
int terse_output = 0;
unsigned long long mlock_size = 0;
int exitall_on_terminate = 0;
int terse_output = 0;
unsigned long long mlock_size = 0;
@@
-517,16
+516,16
@@
static void fixup_options(struct thread_data *td)
static char *to_kmg(unsigned int val)
{
char *buf = malloc(32);
static char *to_kmg(unsigned int val)
{
char *buf = malloc(32);
- char post[] = { 0, 'K', 'M', 'G', 'P',
-1
};
+ char post[] = { 0, 'K', 'M', 'G', 'P',
0
};
char *p = post;
char *p = post;
-
while (*p != -1)
{
+
do
{
if (val & 1023)
break;
val >>= 10;
p++;
if (val & 1023)
break;
val >>= 10;
p++;
- }
+ }
while (*p);
snprintf(buf, 31, "%u%c", val, *p);
return buf;
snprintf(buf, 31, "%u%c", val, *p);
return buf;
@@
-850,6
+849,7
@@
static int str_ioengine_cb(void *data, const char *str)
return 0;
log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
return 0;
log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n");
+ log_err("fio: or specify path to dynamic ioengine module\n");
return 1;
}
return 1;
}