X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/860d8455a4aca1de4a2730a66f1f784c214fb535..42899c56484678345296504a65de123846148658:/src/gras/Virtu/process.c diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c index 31732a38a7..98c64813ac 100644 --- a/src/gras/Virtu/process.c +++ b/src/gras/Virtu/process.c @@ -7,9 +7,9 @@ /* 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" @@ -17,14 +17,14 @@ #include "gras/Virtu/virtu_private.h" -XBT_LOG_NEW_SUBCATEGORY(virtu,gras,"Virtualization code"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(process,virtu,"Process manipulation code"); +XBT_LOG_NEW_SUBCATEGORY(gras_virtu,gras,"Virtualization code"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_virtu_process,gras_virtu,"Process manipulation code"); /* Functions to handle gras_procdata_t->libdata cells*/ typedef struct { char *name; - pvoid_f_void_t *creator; + pvoid_f_void_t *constructor; void_f_pvoid_t *destructor; } s_gras_procdata_fabric_t, *gras_procdata_fabric_t; @@ -37,8 +37,9 @@ static void gras_procdata_fabric_free(void *fab) { /** @brief declare the functions in charge of creating/destructing the procdata of a module * * This is intended to be called from the gras__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 constructor,void_f_pvoid_t destructor) { gras_procdata_fabric_t fab; @@ -50,9 +51,10 @@ void gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t d fab=xbt_dynar_push_ptr(_gras_procdata_fabrics); - fab->name = xbt_strdup(name); - fab->creator = creator; - fab->destructor = destructor; + fab->name = xbt_strdup(name); + fab->constructor = constructor; + fab->destructor = destructor; + return xbt_dynar_length(_gras_procdata_fabrics)-1; } /* ************************************************************************** @@ -69,19 +71,40 @@ void gras_userdata_set(void *ud) { 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)); + return gras_libdata_by_name_from_procdata(name,pd); +} + +/* this function is splitted from previous to allow SG to get libdata from remote hosts */ +void *gras_libdata_by_name_from_procdata(const char*name, gras_procdata_t* pd) { + void *res=NULL; + xbt_ex_t e; + + if (xbt_set_length(pd->libdata) < xbt_dynar_length(_gras_procdata_fabrics)) { + /* Damn, some new modules were added since procdata_init(). Amok? */ + /* Get 'em all */ + gras_procdata_init(); + } + TRY { + res = xbt_set_get_by_name(pd->libdata, name); + } CATCH(e) { + RETHROW1("Cannot retrieve the libdata associated to %s: %s",name); + } return res; } +void *gras_libdata_by_id(int id) { + gras_procdata_t *pd=gras_procdata_get(); + if (xbt_set_length(pd->libdata) < xbt_dynar_length(_gras_procdata_fabrics)) { + /* Damn, some new modules were added since procdata_init(). Amok? */ + /* Get 'em all */ + gras_procdata_init(); + } + return xbt_set_get_by_id(pd->libdata, id); +} + void gras_procdata_init() { gras_procdata_t *pd=gras_procdata_get(); @@ -89,24 +112,48 @@ gras_procdata_init() { int cursor; - xbt_error_t errcode; + xbt_ex_t e; void *data; + xbt_set_elm_t elem; - pd->userdata = NULL; - pd->libdata = xbt_dict_new(); + if (!pd->libdata) { + pd->userdata = NULL; + pd->libdata = xbt_set_new(); + } - xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){ + 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); + if (cursor+1 <= xbt_set_length(pd->libdata)) { + DEBUG2("Skip fabric %d: there is already %ld libdata", + cursor, xbt_set_length(pd->libdata)); + continue; /* allow to recall this function to get recently added fabrics */ + } + DEBUG2("Go ahead for cursor %d, there is %ld libdata", + cursor,xbt_set_length(pd->libdata)); - /* 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, after some more sanity checking */ + elem = (fab.constructor)(); + if (elem->name_len && elem->name_len != strlen(elem->name)) { + elem->name_len = strlen(elem->name); + WARN1("Module '%s' constructor is borken: it does not set elem->name_len", + fab.name); + } + + xbt_set_add(pd->libdata, elem, fab.destructor); } } @@ -115,7 +162,7 @@ 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))) {