/* $Id$ */
-/* config - Dictionnary where the type of each cell is provided. */
+/* config - Dictionary where the type of each cell is provided. */
/* This is useful to build named structs, like option or property sets. */
-/* Authors: Martin Quinson */
-/* Copyright (C) 2001,2002,2003,2004 the OURAGAN project. */
+/* Copyright (c) 2001,2002,2003,2004 Martin Quinson. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
- under the terms of the license (GNU LGPL) which comes with this package. */
-
-#ifndef _GRAS_CONFIG_H_
-#define _GRAS_CONFIG_H_
-
-/* For now, a config is only a special dynar. But don't rely on it, */
-/* it may change in the future. */
-typedef gras_dynar_t gras_cfg_t;
-
-/* type of a typed hash cell */
-typedef enum {
- gras_cfgelm_int=0, gras_cfgelm_double, gras_cfgelm_string, gras_cfgelm_host,
- gras_cfgelm_type_count
-} gras_cfgelm_type_t;
-
-/*----[ Memory management ]-----------------------------------------------*/
-gras_cfg_t *gras_cfg_new (void);
-void gras_cfg_cpy(gras_cfg_t **whereto, gras_cfg_t *tocopy);
-void gras_cfg_free(gras_cfg_t **cfg);
-void gras_cfg_dump(const char *name,const char*indent,gras_cfg_t *cfg);
-
-/*----[ Registering stuff ]-----------------------------------------------*/
-/* Register a possible cell */
-void gras_cfg_register(gras_cfg_t *cfg,
- const char *name, gras_cfgelm_type_t type,
- int min, int max);
-/* Unregister a possible cell */
-gras_error_t gras_cfg_unregister(gras_cfg_t *cfg, const char *name);
-
-/* Parse the configuration descriptor and register it */
-/* Should be of the form "<name>:<min nb>_to_<max nb>_<type>", */
-/* with type being one of 'string','int', 'host' or 'double' */
-gras_error_t gras_cfg_register_str(gras_cfg_t *cfg, const char *entry);
-
-/* Check that each cell have the right amount of elements */
-gras_error_t gras_cfg_check(gras_cfg_t *cfg);
-
-/* Get the type of this option in that repository */
-gras_error_t gras_cfg_get_type(gras_cfg_t *cfg, const char *name,
- /* OUT */ gras_cfgelm_type_t *type);
-
-/*----[ Setting ]---------------------------------------------------------
- * gras_cfg_set_* functions.
- *
- * If the registered maximum is equal to 1, those functions remplace the
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#ifndef _XBT_CONFIG_H_
+#define _XBT_CONFIG_H_
+
+#include "xbt/dynar.h"
+
+BEGIN_DECL()
+
+/** @addtogroup XBT_config
+ *
+ * All modules of the SimGrid toolkit can be configured with this API.
+ * User modules and libraries can also use these facilities to handle
+ * their own configuration.
+ *
+ * A configuration set contain several \e variables which have a unique name
+ * in the set and can take a given type of value. For example, it may
+ * contain a \a size variable, accepting \e int values.
+ *
+ * It is impossible to set a value to a variable which has not been registered before.
+ * Usually, the module registers all the options it accepts in the configuration set,
+ * during its initialization and user code then set and unset values.
+ *
+ * The easiest way to register a variable is to use the xbt_str_register_str function,
+ * which accepts a string representation of the config element descriptor. The syntax
+ * is the following: \verbatim <name>:<min nb>_to_<max nb>_<type>\endverbatim
+ *
+ * For example, <tt>size:1_to_1_int</tt> describes a variable called \e size which
+ * must take exactly one value, and the value being an integer.
+ *
+ * Another example could be <tt>outputfiles:0_to_10_string</tt> which describes a variable
+ * called \e outputfiles and which can take between 0 and 10 strings as value.
+ *
+ * To some extend, configuration sets can be seen as typed hash structures.
+ *
+ * \todo This great mechanism is not used in SimGrid yet...
+ *
+ * \todo We need a callback mechanism so that the configurable code get
+ * notified of configuration changes.
+ *
+ * \section XBT_cfg_ex Example
+ *
+ * \dontinclude config_usage.c
+ *
+ * First, let's create a configuration set with some registered variables.
+ * This must be done by the configurable library before the user interactions.
+ *
+ * \skip make_set
+ * \until end_of_make_set
+ *
+ * Now, set and get a single value
+ * \skip get_single_value
+ * \skip int
+ * \until cfg_free
+ *
+ * And now, set and get a multiple value
+ * \skip get_multiple_value
+ * \skip dyn
+ * \until cfg_free
+ *
+ * All those functions throws mismatch_error if asked to deal with an
+ * unregistered variable.
+ * \skip myset
+ * \until cfg_free
+ * @{
+ */
+
+/** @name 1. Type declaration and memory management
+ *
+ *
+ *
+ * @{
+ */
+ /** @brief Configuration set are only special dynars. But don't rely on it, it may change. */
+ typedef xbt_dynar_t xbt_cfg_t;
+
+ /** @brief possible content of each configuration cell */
+ typedef enum {
+ xbt_cfgelm_int=0, /**< int */
+ xbt_cfgelm_double, /**< double */
+ xbt_cfgelm_string, /**< char* */
+ xbt_cfgelm_host, /**< both a char* (representing the hostname) and an integer (representing the port) */
+ xbt_cfgelm_type_count
+ } e_xbt_cfgelm_type_t;
+
+ xbt_cfg_t xbt_cfg_new (void);
+ void xbt_cfg_cpy(xbt_cfg_t tocopy, /* OUT */ xbt_cfg_t *whereto);
+ void xbt_cfg_free(xbt_cfg_t *cfg);
+ void xbt_cfg_dump(const char *name,const char*indent,xbt_cfg_t cfg);
+
+ /** @} */
+
+/** @name 2. User interface: changing values
+ *
+ * This is the only interface you should use unless you want to let your
+ * own code become configurable with this.
+ *
+ * If the variable accept at most one value, those functions replace the
* current value with the provided one. If max>1, the provided value is
* appended to the list.
*
- * string values are strdup'ed before use, so you have to free your copy */
-
-gras_error_t gras_cfg_set_vargs(gras_cfg_t *cfg, va_list pa);
-gras_error_t gras_cfg_set(gras_cfg_t *cfg, ...);
-
-/*
- Add the cells described in a string to a typed hash.
+ * string values are strdup'ed before use, so you can (and should) free
+ * your copy
+ *
+ * @{
*/
-gras_error_t gras_cfg_set_parse(gras_cfg_t *cfg, const char *options);
+
+ xbt_error_t xbt_cfg_set(xbt_cfg_t cfg, ...);
+ xbt_error_t xbt_cfg_set_vargs(xbt_cfg_t cfg, va_list pa);
+ xbt_error_t xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options);
/*
- Set the value of the cell @name in @cfg with the provided value.
+ Set the value of the cell \a name in \a cfg with the provided value.
*/
-gras_error_t gras_cfg_set_int (gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_set_int (xbt_cfg_t cfg, const char *name,
int val);
-gras_error_t gras_cfg_set_double(gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_set_double(xbt_cfg_t cfg, const char *name,
double val);
-gras_error_t gras_cfg_set_string(gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_set_string(xbt_cfg_t cfg, const char *name,
const char *val);
-gras_error_t gras_cfg_set_host (gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_set_host (xbt_cfg_t cfg, const char *name,
const char *host,int port);
/*
Remove the provided value from the cell @name in @cfg.
*/
-gras_error_t gras_cfg_rm_int (gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_rm_int (xbt_cfg_t cfg, const char *name,
int val);
-gras_error_t gras_cfg_rm_double(gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_rm_double(xbt_cfg_t cfg, const char *name,
double val);
-gras_error_t gras_cfg_rm_string(gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_rm_string(xbt_cfg_t cfg, const char *name,
const char *val);
-gras_error_t gras_cfg_rm_host (gras_cfg_t *cfg, const char *name,
+xbt_error_t xbt_cfg_rm_host (xbt_cfg_t cfg, const char *name,
const char *host,int port);
/* rm every values */
-gras_error_t gras_cfg_empty(gras_cfg_t *cfg, const char *name);
-
-/*----[ Getting ]---------------------------------------------------------*/
-/* Returns a pointer to the values actually stored in the cache. Do not */
-/* modify them unless you really know what you're doing. */
-gras_error_t gras_cfg_get_int (gras_cfg_t *cfg,
- const char *name,
- int *val);
-gras_error_t gras_cfg_get_double(gras_cfg_t *cfg,
- const char *name,
- double *val);
-gras_error_t gras_cfg_get_string(gras_cfg_t *cfg,
- const char *name,
- char **val);
-gras_error_t gras_cfg_get_host (gras_cfg_t *cfg,
- const char *name,
- char **host,
- int *port);
-gras_error_t gras_cfg_get_dynar (gras_cfg_t *cfg,
- const char *name,
- gras_dynar_t **dynar);
-
-
-#endif /* _GRAS_CONFIG_H_ */
+xbt_error_t xbt_cfg_empty(xbt_cfg_t cfg, const char *name);
+
+/* @} */
+/** @name 3. Registering stuff
+ *
+ * This how to add new variables to an existing configuration set. Use it to make your code
+ * configurable.
+ *
+ * @{
+ */
+ void xbt_cfg_register(xbt_cfg_t cfg,
+ const char *name, e_xbt_cfgelm_type_t type,
+ int min, int max);
+ xbt_error_t xbt_cfg_unregister(xbt_cfg_t cfg, const char *name);
+ xbt_error_t xbt_cfg_register_str(xbt_cfg_t cfg, const char *entry);
+ xbt_error_t xbt_cfg_check(xbt_cfg_t cfg);
+ xbt_error_t xbt_cfg_get_type(xbt_cfg_t cfg, const char *name,
+ /* OUT */ e_xbt_cfgelm_type_t *type);
+/* @} */
+/** @name 4. Getting the stored values
+ *
+ * This is how to retrieve the values stored in the configuration set. This is only
+ * intended to configurable code, naturally.
+ *
+ * Note that those function return a pointer to the values actually stored
+ * in the set. Do not modify them unless you really know what you're doing.
+ *
+ * @{
+ */
+
+ xbt_error_t xbt_cfg_get_int (xbt_cfg_t cfg, const char *name, int *val);
+ xbt_error_t xbt_cfg_get_double(xbt_cfg_t cfg, const char *name, double *val);
+ xbt_error_t xbt_cfg_get_string(xbt_cfg_t cfg, const char *name, char **val);
+ xbt_error_t xbt_cfg_get_host (xbt_cfg_t cfg, const char *name, char **host, int *port);
+ xbt_error_t xbt_cfg_get_dynar (xbt_cfg_t cfg, const char *name, xbt_dynar_t *dynar);
+
+/** @} */
+/** @} */
+END_DECL()
+
+#endif /* _XBT_CONFIG_H_ */