X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.h;h=5276f31e6818673a338fcbc3ef18997263b0abd0;hp=ed6b9c2da47a5699cb9b4d3f1808eba4b8ede019;hb=de5ed0e4d398bc9d4576f9b2b82d7686989c27e1;hpb=7e356b2dee2e86f3684424fc6e903f1ef9f00ef4

diff --git a/options.h b/options.h
index ed6b9c2d..5276f31e 100644
--- a/options.h
+++ b/options.h
@@ -4,12 +4,11 @@
 #define FIO_MAX_OPTS		512
 
 #include <string.h>
+#include <inttypes.h>
 #include "parse.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 *);
+int add_option(const struct fio_option *);
 void invalidate_profile_options(const char *);
 extern char *exec_profile;
 
@@ -17,27 +16,41 @@ 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 *);
+char *get_next_str(char **ptr);
+int get_max_str_idx(char *input);
+char* get_name_by_idx(char *input, int index);
+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 *,
+				const struct fio_option *);
+
+static inline bool o_match(const 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 const struct fio_option *
+find_option_c(const struct fio_option *, const char *);
+extern struct fio_option *fio_option_find(const char *);
+extern unsigned int fio_get_kb_base(void *);
 
 #endif