#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "gras/transport.h"
-#include "gras/datadesc.h"
+#include "xbt/datadesc.h"
#include "gras/messages.h"
#include "gras_modinter.h"
unsigned int cursor;
- xbt_ex_t e;
xbt_set_elm_t elem;
if (!pd->libdata) {
}
xbt_dynar_foreach(_gras_procdata_fabrics, cursor, fab) {
- volatile int found = 0;
if (cursor + 1 <= xbt_set_length(pd->libdata)) {
- XBT_DEBUG("Skip fabric %d: there is already %ld libdata",
+ XBT_DEBUG("Skip fabric %u: there is already %lu 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",
+ XBT_DEBUG("Go ahead for cursor %u, there is %lu libdata",
cursor, xbt_set_length(pd->libdata));
- xbt_assert(fab.name, "Name of fabric #%d is NULL!", cursor);
+ xbt_assert(fab.name, "Name of fabric #%u is NULL!", cursor);
XBT_DEBUG("Create the procdata for %s", fab.name);
/* Check for our own errors */
- TRY {
- xbt_set_get_by_name(pd->libdata, fab.name);
- found = 1;
- }
- CATCH(e) {
- xbt_ex_free(e);
- found = 0;
- }
- if (found)
+
+ if (xbt_set_get_by_name_or_null(pd->libdata, fab.name) != NULL)
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)) ();
+ elem = fab.constructor();
if (elem->name_len && elem->name_len != strlen(elem->name)) {
elem->name_len = strlen(elem->name);
XBT_WARN
const char *gras_os_hostport()
{
static char *res = NULL;
- if (res)
- free(res); /* my port may have changed */
+ free(res); /* my port may have changed */
res = bprintf("%s:%d", gras_os_myname(), gras_os_myport());
return (const char *) res;
}