X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec16845133f5f1b5262d2d77d8ba22824fa8a446..53cde8dfb94134348e908b3c2845200ffc582dc7:/src/gras/Msg/gras_msg_types.c diff --git a/src/gras/Msg/gras_msg_types.c b/src/gras/Msg/gras_msg_types.c index 83a606c2c8..8d43297815 100644 --- a/src/gras/Msg/gras_msg_types.c +++ b/src/gras/Msg/gras_msg_types.c @@ -9,7 +9,7 @@ #include "xbt/ex.h" #include "gras/Msg/msg_private.h" #include "gras/Virtu/virtu_interface.h" -#include "gras/DataDesc/datadesc_interface.h" +#include "xbt/datadesc/datadesc_interface.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg, gras, "High level messaging"); @@ -44,11 +44,11 @@ void gras_msgtype_dumpall(void) 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), + xbt_datadesc_get_name(msgtype->ctn_type), (msgtype->kind == e_gras_msg_kind_rpccall ? " -> " : ""), (msgtype->kind == e_gras_msg_kind_rpccall ? - gras_datadesc_get_name(msgtype->answer_type) : "")); + xbt_datadesc_get_name(msgtype->answer_type) : "")); } } @@ -72,46 +72,35 @@ void gras_msgtype_declare_ext(const char *name, short int version, e_gras_msg_kind_t kind, - gras_datadesc_type_t payload_request, - gras_datadesc_type_t payload_answer) + xbt_datadesc_type_t payload_request, + xbt_datadesc_type_t payload_answer) { 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) { + 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(!xbt_datadesc_type_cmp (msgtype->ctn_type, payload_request), - "Message %s re-registred with another payload (%s was %s)", - namev, gras_datadesc_get_name(payload_request), - gras_datadesc_get_name(msgtype->ctn_type)); + "Message %s re-registered with another payload (%s was %s)", + namev, xbt_datadesc_get_name(payload_request), + xbt_datadesc_get_name(msgtype->ctn_type)); - xbt_assert3(!gras_datadesc_type_cmp + xbt_assert(!xbt_datadesc_type_cmp (msgtype->answer_type, payload_answer), - "Message %s re-registred with another answer payload (%s was %s)", - namev, gras_datadesc_get_name(payload_answer), - gras_datadesc_get_name(msgtype->answer_type)); + "Message %s re-registered with another answer payload (%s was %s)", + namev, xbt_datadesc_get_name(payload_answer), + xbt_datadesc_get_name(msgtype->answer_type)); xbt_free(namev); return; /* do really ignore it */ @@ -119,8 +108,8 @@ gras_msgtype_declare_ext(const char *name, 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)); + version, name, xbt_datadesc_get_name(payload_request), + xbt_datadesc_get_name(payload_answer)); msgtype = xbt_new(s_gras_msgtype_t, 1); msgtype->name = namev; @@ -140,7 +129,7 @@ gras_msgtype_declare_ext(const char *name, * @param name: name as it should be used for logging messages (must be uniq) * @param payload: datadescription of the payload */ -void gras_msgtype_declare(const char *name, gras_datadesc_type_t payload) +void gras_msgtype_declare(const char *name, xbt_datadesc_type_t payload) { gras_msgtype_declare_ext(name, 0, e_gras_msg_kind_oneway, payload, NULL); } @@ -161,7 +150,7 @@ void gras_msgtype_declare(const char *name, gras_datadesc_type_t payload) */ void gras_msgtype_declare_v(const char *name, - short int version, gras_datadesc_type_t payload) + short int version, xbt_datadesc_type_t payload) { gras_msgtype_declare_ext(name, version, @@ -182,7 +171,8 @@ gras_msgtype_t gras_msgtype_by_name_or_null(const char *name) TRY { res = gras_msgtype_by_namev(name, 0); - } CATCH(e) { + } + CATCH(e) { res = NULL; xbt_ex_free(e); } @@ -194,21 +184,14 @@ gras_msgtype_t gras_msgtype_by_namev(const char *name, short int version) { 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) - THROWF(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; } @@ -306,18 +289,18 @@ void gras_cb_unregister_(gras_msgtype_t msgtype, gras_msg_cb_t cb) } } if (!found) - XBT_VERB("Ignoring removal of unexisting callback to msg id %d", + XBT_VERB("Ignoring removal of unexisting callback to msg id %u", msgtype->code); } /** \brief Retrieve the expeditor of the message */ -gras_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx) +xbt_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx) { return ctx->expeditor; } /* \brief Creates a new message exchange context (user should never have to) */ -gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe, +gras_msg_cb_ctx_t gras_msg_cb_ctx_new(xbt_socket_t expe, gras_msgtype_t msgtype, unsigned long int ID, int answer_due, double timeout)