projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename fls() to __fls()
[fio.git]
/
options.c
diff --git
a/options.c
b/options.c
index b8df1da1f90756f68cd5fd15b50500b646ba55b3..3c37e9105698cbabb0f46d66816de93762d8cd3e 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-6,6
+6,9
@@
#include <getopt.h>
#include <assert.h>
#include <libgen.h>
#include <getopt.h>
#include <assert.h>
#include <libgen.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include "fio.h"
#include "parse.h"
#include "fio.h"
#include "parse.h"
@@
-403,7
+406,7
@@
static int str_verify_pattern_cb(void *data, unsigned int *off)
struct thread_data *td = data;
unsigned int msb;
struct thread_data *td = data;
unsigned int msb;
- msb = fls(*off);
+ msb =
__
fls(*off);
if (msb <= 8)
td->o.verify_pattern_bytes = 1;
else if (msb <= 16)
if (msb <= 8)
td->o.verify_pattern_bytes = 1;
else if (msb <= 16)
@@
-553,6
+556,11
@@
static struct fio_option options[] = {
{ .ival = "posixaio",
.help = "POSIX asynchronous IO",
},
{ .ival = "posixaio",
.help = "POSIX asynchronous IO",
},
+#endif
+#ifdef FIO_HAVE_SOLARISAIO
+ { .ival = "solarisaio",
+ .help = "Solaris native asynchronous IO",
+ },
#endif
{ .ival = "mmap",
.help = "Memory mapped IO",
#endif
{ .ival = "mmap",
.help = "Memory mapped IO",
@@
-1275,7
+1283,7
@@
void fio_options_dup_and_init(struct option *long_options)
o = &options[0];
while (o->name) {
o = &options[0];
while (o->name) {
- long_options[i].name = o->name;
+ long_options[i].name =
(char *)
o->name;
long_options[i].val = FIO_GETOPT_JOB;
if (o->type == FIO_OPT_STR_SET)
long_options[i].has_arg = no_argument;
long_options[i].val = FIO_GETOPT_JOB;
if (o->type == FIO_OPT_STR_SET)
long_options[i].has_arg = no_argument;