Add configuration parsing to the public API.

Don't remove it from the extension API for now - to match the value
packing code. Updated inline documentation, but not the official
documentation - since I suspect this will change before it's merged.
Update wtperf usage of configuration parsing API.

1 files changed, 96 insertions, 0 deletions

diff --git a/src/config/config_api.c b/src/config/config_api.c
new file mode 100644
index 00000000000..a5781a20c61
--- /dev/null
+++ b/src/config/config_api.c
@@ -0,0 +1,96 @@
+/*-
+ * Copyright (c) 2008-2014 WiredTiger, Inc.
+ *	All rights reserved.
+ *
+ * See the file LICENSE for redistribution information.
+ */
+
+#include "wt_internal.h"
+
+/*
+ * wiredtiger_config_get --
+ *	Given a NULL-terminated list of configuration strings, find the final
+ * value for a given string key (external API version).
+ */
+int
+wiredtiger_config_get(WT_SESSION *wt_session,
+     WT_CONFIG_ARG *cfg_arg, const char *key, WT_CONFIG_ITEM *cval)
+{
+	WT_SESSION_IMPL *session;
+	const char **cfg;
+
+	session = (WT_SESSION_IMPL *)wt_session;
+
+	if ((cfg = (const char **)cfg_arg) == NULL)
+		return (WT_NOTFOUND);
+	return (__wt_config_gets(session, cfg, key, cval));
+}
+
+/*
+ * wiredtiger_config_strget --
+ *	Given a single configuration string, find the final value for a given
+ * string key (external API version).
+ */
+int
+wiredtiger_config_strget(WT_SESSION *wt_session,
+    const char *config, const char *key, WT_CONFIG_ITEM *cval)
+{
+	const char *cfg_arg[] = { config, NULL };
+
+	return (wiredtiger_config_get(
+	    wt_session, (WT_CONFIG_ARG *)cfg_arg, key, cval));
+}
+
+/*
+ * wiredtiger_config_scan_begin --
+ *	Start a scan of a config string.
+ */
+int
+wiredtiger_config_scan_begin(WT_SESSION *wt_session,
+    const char *str, size_t len, WT_CONFIG_SCAN **scanp)
+{
+	WT_CONFIG config, *scan;
+	WT_SESSION_IMPL *session;
+
+	session = (WT_SESSION_IMPL *)wt_session;
+
+	/* Note: allocate memory last to avoid cleanup. */
+	WT_CLEAR(config);
+	WT_RET(__wt_config_initn(session, &config, str, len));
+	WT_RET(__wt_calloc_def(session, 1, &scan));
+	*scan = config;
+	*scanp = (WT_CONFIG_SCAN *)scan;
+	return (0);
+}
+
+/*
+ * wiredtiger_config_scan_end --
+ *	End a scan of a config string.
+ */
+int
+wiredtiger_config_scan_end(WT_SESSION *wt_session, WT_CONFIG_SCAN *scan)
+{
+	WT_CONFIG *conf;
+
+	WT_UNUSED(wt_session);
+
+	conf = (WT_CONFIG *)scan;
+	__wt_free(conf->session, scan);
+	return (0);
+}
+
+/*
+ * wiredtiger_config_scan_next --
+ *	Get the next key/value pair from a config scan.
+ */
+int
+wiredtiger_config_scan_next(WT_SESSION *wt_session,
+    WT_CONFIG_SCAN *scan, WT_CONFIG_ITEM *key, WT_CONFIG_ITEM *value)
+{
+	WT_CONFIG *conf;
+
+	WT_UNUSED(wt_session);
+
+	conf = (WT_CONFIG *)scan;
+	return (__wt_config_next(conf, key, value));
+}