X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1af4ffdbe3a94ec673728673636f5a36d2b0a539..c1196ca10d1165bfaadfd66799bff4e0eec459b5:/src/gras/Virtu/process.c diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c index 9b6c65c62f..de2085b4b8 100644 --- a/src/gras/Virtu/process.c +++ b/src/gras/Virtu/process.c @@ -1,8 +1,7 @@ -/* $Id$ */ - /* process - GRAS process handling (common code for RL and SG) */ -/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team. + * 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. */ @@ -17,21 +16,22 @@ #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; - void_f_pvoid_t *destructor; + char *name; + pvoid_f_void_t constructor; + void_f_pvoid_t destructor; } s_gras_procdata_fabric_t, *gras_procdata_fabric_t; -static xbt_dynar_t _gras_procdata_fabrics = NULL; /* content: s_gras_procdata_fabric_t */ +static xbt_dynar_t _gras_procdata_fabrics = NULL; /* content: s_gras_procdata_fabric_t */ -static void gras_procdata_fabric_free(void *fab) { - free( ((gras_procdata_fabric_t)fab)->name ); +static void gras_procdata_fabric_free(void *fab) +{ + free(((gras_procdata_fabric_t) fab)->name); } /** @brief declare the functions in charge of creating/destructing the procdata of a module @@ -39,100 +39,157 @@ static void gras_procdata_fabric_free(void *fab) { * This is intended to be called from the gras__register function. * This returns the module ID you can use for gras_libdata_by_id() */ -int gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor) { - - gras_procdata_fabric_t fab; - - if (!_gras_procdata_fabrics) { - /* create the dynar if needed */ - _gras_procdata_fabrics = xbt_dynar_new(sizeof(s_gras_procdata_fabric_t), - gras_procdata_fabric_free); - } - - fab=xbt_dynar_push_ptr(_gras_procdata_fabrics); - - fab->name = xbt_strdup(name); - fab->creator = creator; - fab->destructor = destructor; - return xbt_dynar_length(_gras_procdata_fabrics)-1; +int gras_procdata_add(const char *name, pvoid_f_void_t constructor, + void_f_pvoid_t destructor) +{ + + gras_procdata_fabric_t fab; + + if (!_gras_procdata_fabrics) { + /* create the dynar if needed */ + _gras_procdata_fabrics = + xbt_dynar_new(sizeof(s_gras_procdata_fabric_t), + gras_procdata_fabric_free); + } + + fab = xbt_dynar_push_ptr(_gras_procdata_fabrics); + + fab->name = xbt_strdup(name); + fab->constructor = constructor; + fab->destructor = destructor; + + return xbt_dynar_length(_gras_procdata_fabrics) - 1; } /* ************************************************************************** * Process data * **************************************************************************/ -void *gras_userdata_get(void) { - gras_procdata_t *pd=gras_procdata_get(); +void *gras_userdata_get(void) +{ + gras_procdata_t *pd = gras_procdata_get(); return pd->userdata; } -void gras_userdata_set(void *ud) { - gras_procdata_t *pd=gras_procdata_get(); +void *gras_userdata_set(void *ud) +{ + gras_procdata_t *pd = gras_procdata_get(); pd->userdata = ud; + return ud; } -void *gras_libdata_by_name(const char *name) { - gras_procdata_t *pd=gras_procdata_get(); - void *res=NULL; - xbt_ex_t e; - +void *gras_libdata_by_name(const char *name) +{ + gras_procdata_t *pd = gras_procdata_get(); + 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; + 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 retrive the libdata associated to %s: %s",name); - } + } + CATCH_ANONYMOUS { + RETHROWF("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(); +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(); + +void gras_procdata_init() +{ + gras_procdata_t *pd = gras_procdata_get(); s_gras_procdata_fabric_t fab; - - int cursor; - + + unsigned int cursor; + xbt_ex_t e; - void *data; + xbt_set_elm_t elem; - pd->userdata = NULL; - pd->libdata = xbt_set_new(); - - xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){ + if (!pd->libdata) { + pd->userdata = NULL; + 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); + + if (cursor + 1 <= xbt_set_length(pd->libdata)) { + XBT_DEBUG("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 */ + } + XBT_DEBUG("Go ahead for cursor %d, there is %ld libdata", + cursor, xbt_set_length(pd->libdata)); + + xbt_assert(fab.name, "Name of fabric #%d is NULL!", cursor); + XBT_DEBUG("Create the procdata for %s", fab.name); /* Check for our own errors */ TRY { - data = xbt_set_get_by_name(pd->libdata, fab.name); + xbt_set_get_by_name(pd->libdata, fab.name); found = 1; - } CATCH(e) { + } + 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); + THROWF(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); + XBT_WARN + ("Module '%s' constructor is borken: it does not set elem->name_len", + fab.name); + } + xbt_set_add(pd->libdata, elem, fab.destructor); } } -void -gras_procdata_exit() { +void gras_procdata_exit() +{ int len; - gras_procdata_t *pd=gras_procdata_get(); + gras_procdata_t *pd = gras_procdata_get(); + + xbt_set_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); + while ((len = xbt_dynar_length(_gras_procdata_fabrics))) { + xbt_dynar_remove_at(_gras_procdata_fabrics, len - 1, NULL); } - xbt_dynar_free( & _gras_procdata_fabrics ); + xbt_dynar_free(&_gras_procdata_fabrics); +} + + +const char *gras_os_hostport() +{ + static char *res = NULL; + if (res) + free(res); /* my port may have changed */ + res = bprintf("%s:%d", gras_os_myname(), gras_os_myport()); + return (const char *) res; }