projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smalloc: don't use void* for pointer arithmetic (gcc)
[fio.git]
/
options.h
diff --git
a/options.h
b/options.h
index 4727bac222ce33169b5f3dd213b5c931365c8f80..83a58e27d50718ba91d909795aec5f419440ca2a 100644
(file)
--- a/
options.h
+++ b/
options.h
@@
-9,8
+9,6
@@
#include "flist.h"
#include "lib/types.h"
#include "flist.h"
#include "lib/types.h"
-#define td_var_offset(var) ((size_t) &((struct thread_options *)0)->var)
-
int add_option(struct fio_option *);
void invalidate_profile_options(const char *);
extern char *exec_profile;
int add_option(struct fio_option *);
void invalidate_profile_options(const char *);
extern char *exec_profile;
@@
-19,7
+17,6
@@
void add_opt_posval(const char *, const char *, const char *);
void del_opt_posval(const char *, const char *);
struct thread_data;
void fio_options_free(struct thread_data *);
void del_opt_posval(const char *, const char *);
struct thread_data;
void fio_options_free(struct thread_data *);
-char *get_name_idx(char *, int);
int set_name_idx(char *, size_t, char *, int, bool);
extern char client_sockaddr_str[]; /* used with --client option */
int set_name_idx(char *, size_t, char *, int, bool);
extern char client_sockaddr_str[]; /* used with --client option */
@@
-30,7
+27,7
@@
extern bool __fio_option_is_set(struct thread_options *, unsigned int off);
#define fio_option_is_set(__td, name) \
({ \
#define fio_option_is_set(__td, name) \
({ \
- const unsigned int off =
td_var_offset(name);
\
+ const unsigned int off =
offsetof(struct thread_options, name);
\
bool __r = __fio_option_is_set((__td), off); \
__r; \
})
bool __r = __fio_option_is_set((__td), off); \
__r; \
})
@@
-47,19
+44,8
@@
static inline bool o_match(struct fio_option *o, const char *opt)
return false;
}
return false;
}
-static inline struct fio_option *find_option(struct fio_option *options,
- const char *opt)
-{
- struct fio_option *o;
-
- for (o = &options[0]; o->name; o++)
- if (o_match(o, opt))
- return o;
-
- return NULL;
-}
-
-extern struct fio_option *fio_option_find(const char *name);
+extern struct fio_option *find_option(struct fio_option *, const char *);
+extern struct fio_option *fio_option_find(const char *);
extern unsigned int fio_get_kb_base(void *);
#endif
extern unsigned int fio_get_kb_base(void *);
#endif