/* 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. */
+#include "xbt/ex.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "xbt/error.h"
#include "gras/transport.h"
#include "gras/datadesc.h"
#include "gras/messages.h"
/** @brief declare the functions in charge of creating/destructing the procdata of a module
*
* This is intended to be called from the gras_<module>_register function.
+ * This returns the module ID you can use for gras_libdata_by_id()
*/
-void gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor) {
+int gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor) {
gras_procdata_fabric_t fab;
fab->name = xbt_strdup(name);
fab->creator = creator;
fab->destructor = destructor;
+ return xbt_dynar_length(_gras_procdata_fabrics)-1;
}
/* **************************************************************************
pd->userdata = ud;
}
-void *gras_libdata_get(const char *name) {
+void *gras_libdata_by_name(const char *name) {
gras_procdata_t *pd=gras_procdata_get();
- void *res;
- xbt_error_t errcode;
-
- errcode = xbt_dict_get(pd->libdata, name, &res);
- xbt_assert2(errcode == no_error,
- "Cannot retrive the libdata associated to %s: %s",
- name, xbt_error_name(errcode));
+ void *res=NULL;
+ xbt_ex_t e;
+ TRY {
+ res = xbt_set_get_by_name(pd->libdata, name);
+ } CATCH(e) {
+ RETHROW1("Cannot retrive the libdata associated to %s: %s",name);
+ }
return res;
}
+void *gras_libdata_by_id(int id) {
+ gras_procdata_t *pd=gras_procdata_get();
+ return xbt_set_get_by_id(pd->libdata, id);
+}
+
void
gras_procdata_init() {
gras_procdata_t *pd=gras_procdata_get();
int cursor;
- xbt_error_t errcode;
+ xbt_ex_t e;
void *data;
pd->userdata = NULL;
- pd->libdata = xbt_dict_new();
+ pd->libdata = xbt_set_new();
xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){
+ volatile int found = 0;
- xbt_assert1(fab.name,"Name of fabric #%d is NULL!",cursor);
- DEBUG1("Create the procdata for %s",fab.name);
- /* Check for our own errors */
- errcode = xbt_dict_get(pd->libdata, fab.name, &data);
- xbt_assert1(errcode == mismatch_error,
- "MayDay: two modules use '%s' as libdata name", fab.name);
-
- /* Add the data in place */
- xbt_dict_set(pd->libdata, fab.name, (fab.creator)(), fab.destructor);
-
+ xbt_assert1(fab.name,"Name of fabric #%d is NULL!",cursor);
+ DEBUG1("Create the procdata for %s",fab.name);
+ /* Check for our own errors */
+ TRY {
+ data = xbt_set_get_by_name(pd->libdata, fab.name);
+ found = 1;
+ } CATCH(e) {
+ xbt_ex_free(&e);
+ found = 0;
+ }
+ if (found)
+ THROW1(unknown_error,0,"MayDay: two modules use '%s' as libdata name", fab.name);
+
+ /* Add the data in place */
+ xbt_set_add(pd->libdata, (fab.creator)(), fab.destructor);
}
}
void
gras_procdata_exit() {
+ int len;
gras_procdata_t *pd=gras_procdata_get();
- xbt_dict_free(&( pd->libdata ));
+ xbt_set_free(&( pd->libdata ));
+
+ /* Remove procdata in reverse order wrt creation */
+ while ((len=xbt_dynar_length(_gras_procdata_fabrics))) {
+ xbt_dynar_remove_at(_gras_procdata_fabrics,len-1,NULL);
+ }
+ xbt_dynar_free( & _gras_procdata_fabrics );
}