xbt_set_cursor_t cursor;
gras_msgtype_t msgtype = NULL;
- INFO0("Dump of all registered messages:");
+ XBT_INFO("Dump of all registered messages:");
xbt_set_foreach(_gras_msgtype_set, cursor, msgtype) {
- INFO6(" Message name: %s (v%d) %s; %s%s%s",
+ XBT_INFO(" Message name: %s (v%d) %s; %s%s%s",
msgtype->name, msgtype->version,
e_gras_msg_kind_names[msgtype->kind],
gras_datadesc_get_name(msgtype->ctn_type),
gras_msgtype_t msgtype = NULL;
char *namev = make_namev(name, version);
- volatile int found = 0;
- xbt_ex_t e;
- TRY {
- msgtype =
- (gras_msgtype_t) xbt_set_get_by_name(_gras_msgtype_set, namev);
- found = 1;
- } CATCH(e) {
- if (e.category != not_found_error) {
- xbt_free(namev);
- RETHROW;
- }
- xbt_ex_free(e);
- }
+ msgtype = (gras_msgtype_t) xbt_set_get_by_name_or_null(
+ _gras_msgtype_set, (const char*) namev);
- if (found) {
- VERB2
+ if (msgtype != NULL) {
+ XBT_DEBUG
("Re-register version %d of message '%s' (same kind & payload, ignored).",
version, name);
- xbt_assert3(msgtype->kind == kind,
+ xbt_assert(msgtype->kind == kind,
"Message %s re-registered as a %s (it was known as a %s)",
namev, e_gras_msg_kind_names[kind],
e_gras_msg_kind_names[msgtype->kind]);
- xbt_assert3(!gras_datadesc_type_cmp
+ xbt_assert(!gras_datadesc_type_cmp
(msgtype->ctn_type, payload_request),
- "Message %s re-registred with another payload (%s was %s)",
+ "Message %s re-registered with another payload (%s was %s)",
namev, gras_datadesc_get_name(payload_request),
gras_datadesc_get_name(msgtype->ctn_type));
- xbt_assert3(!gras_datadesc_type_cmp
+ xbt_assert(!gras_datadesc_type_cmp
(msgtype->answer_type, payload_answer),
- "Message %s re-registred with another answer payload (%s was %s)",
+ "Message %s re-registered with another answer payload (%s was %s)",
namev, gras_datadesc_get_name(payload_answer),
gras_datadesc_get_name(msgtype->answer_type));
return; /* do really ignore it */
}
- VERB4("Register version %d of message '%s' "
+ XBT_VERB("Register version %d of message '%s' "
"(payload: %s; answer payload: %s).",
version, name, gras_datadesc_get_name(payload_request),
gras_datadesc_get_name(payload_answer));
TRY {
res = gras_msgtype_by_namev(name, 0);
- } CATCH(e) {
+ }
+ CATCH(e) {
res = NULL;
xbt_ex_free(e);
}
{
gras_msgtype_t res = NULL;
char *namev = make_namev(name, version);
- volatile int found = 0;
- xbt_ex_t e;
-
- TRY {
- res = (gras_msgtype_t) xbt_set_get_by_name(_gras_msgtype_set, namev);
- found = 1;
- } CATCH(e) {
- xbt_ex_free(e);
- }
- if (!found)
- THROW1(not_found_error, 0, "No registred message of that name: %s",
- name);
+ res = (gras_msgtype_t) xbt_set_get_by_name_or_null(_gras_msgtype_set, namev);
free(namev);
+ if (res == NULL)
+ THROWF(not_found_error, 0, "No registered message of that name: %s",
+ name);
+
return res;
}
gras_cblist_t *list = NULL;
unsigned int cpt;
- DEBUG2("Register %p as callback to '%s'", cb, msgtype->name);
+ XBT_DEBUG("Register %p as callback to '%s'", cb, msgtype->name);
/* search the list of cb for this message on this host (creating if NULL) */
xbt_dynar_foreach(pd->cbl_list, cpt, list) {
}
}
if (!found)
- VERB1("Ignoring removal of unexisting callback to msg id %d",
+ XBT_VERB("Ignoring removal of unexisting callback to msg id %d",
msgtype->code);
}