X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f780443504c3b73f0b9d1c58c6c5a21e2affce2d..e6bc6eb53997f4648bf3207348c060e9f50ee282:/include/xbt/config.h diff --git a/include/xbt/config.h b/include/xbt/config.h index c652fcc486..023f70ae61 100644 --- a/include/xbt/config.h +++ b/include/xbt/config.h @@ -44,8 +44,6 @@ SG_BEGIN_DECL() * * To some extend, configuration sets can be seen as typed hash structures. * - * \todo This great mechanism is not used in SimGrid yet... - * * * \section XBT_cfg_ex Example of use * @@ -88,8 +86,8 @@ SG_BEGIN_DECL() * * @{ */ - /** @brief Configuration set are only special dynars. But don't rely on it, it may change. */ -typedef xbt_dynar_t xbt_cfg_t; +/** @brief Configuration set's data type is opaque. */ +typedef void* xbt_cfg_t; XBT_PUBLIC(void) xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...); XBT_PUBLIC(void) xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, @@ -141,6 +139,9 @@ XBT_PUBLIC(void) xbt_cfg_rm_at(xbt_cfg_t cfg, const char *name, int pos); /* rm every values */ XBT_PUBLIC(void) xbt_cfg_empty(xbt_cfg_t cfg, const char *name); +/* Return if configuration is set by default*/ +XBT_PUBLIC(int) xbt_cfg_is_default_value(xbt_cfg_t cfg, const char *name); + /* @} */ /** @defgroup XBT_cfg_decl Configuration type declaration and memory management @@ -166,29 +167,6 @@ typedef enum { /** \brief Callback types. They get the name of the modified entry, and the position of the changed value */ typedef void (*xbt_cfg_cb_t) (const char *, int); -/* xbt_cfgelm_t: the typedef corresponding to a config variable. - - Both data and DTD are mixed, but fixing it now would prevent me to ever - defend my thesis. */ - -typedef struct { - /* Description */ - char *desc; - - /* Allowed type of the variable */ - e_xbt_cfgelm_type_t type; - int min, max; - int isdefault:1; - - /* Callbacks */ - xbt_cfg_cb_t cb_set; - xbt_cfg_cb_t cb_rm; - - /* actual content - (cannot be an union because type peer uses both str and i) */ - xbt_dynar_t content; -} s_xbt_cfgelm_t, *xbt_cfgelm_t; - XBT_PUBLIC(xbt_cfg_t) xbt_cfg_new(void); XBT_PUBLIC(void) xbt_cfg_cpy(xbt_cfg_t tocopy, /* OUT */ xbt_cfg_t * whereto); @@ -196,9 +174,6 @@ XBT_PUBLIC(void) xbt_cfg_free(xbt_cfg_t * cfg); XBT_PUBLIC(void) xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg); -/* Retrieve the variable we'll modify */ -XBT_PUBLIC(xbt_cfgelm_t) xbt_cfgelm_get(xbt_cfg_t cfg, const char *name, - e_xbt_cfgelm_type_t type); /** @} */ /** @defgroup XBT_cfg_register Registering stuff