X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.h;h=83a58e27d50718ba91d909795aec5f419440ca2a;hp=c6c2086e0a76286a87f44bbb469307ccdddc09e4;hb=7903bf87725b18495a06f7199342f167147712eb;hpb=f5b6bb85364fcb8b2ac8d922ca65afd9dfabc9bb

diff --git a/options.h b/options.h
index c6c2086e..83a58e27 100644
--- a/options.h
+++ b/options.h
@@ -4,10 +4,10 @@
 #define FIO_MAX_OPTS		512
 
 #include <string.h>
+#include <inttypes.h>
 #include "parse.h"
 #include "flist.h"
-
-#define td_var_offset(var)	((size_t) &((struct thread_options *)0)->var)
+#include "lib/types.h"
 
 int add_option(struct fio_option *);
 void invalidate_profile_options(const char *);
@@ -15,27 +15,37 @@ extern char *exec_profile;
 
 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 *);
+int set_name_idx(char *, size_t, char *, int, bool);
+
+extern char client_sockaddr_str[];  /* used with --client option */
+
+extern struct fio_option fio_options[FIO_MAX_OPTS];
+
+extern bool __fio_option_is_set(struct thread_options *, unsigned int off);
+
+#define fio_option_is_set(__td, name)					\
+({									\
+	const unsigned int off = offsetof(struct thread_options, name);	\
+	bool __r = __fio_option_is_set((__td), off);			\
+	__r;								\
+})
 
-static inline int o_match(struct fio_option *o, const char *opt)
+extern void fio_option_mark_set(struct thread_options *, struct fio_option *);
+
+static inline bool o_match(struct fio_option *o, const char *opt)
 {
 	if (!strcmp(o->name, opt))
-		return 1;
+		return true;
 	else if (o->alias && !strcmp(o->alias, opt))
-		return 1;
+		return true;
 
-	return 0;
+	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 *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