X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/206f5fd3ccc5de9c9e90ec5d8933cab8fd3bf070..16fdb8c65ac8d5baebc0278c499546c5fb10207b:/src/gras/Msg/msg.c diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c index d2c731e7ba..a27a327eea 100644 --- a/src/gras/Msg/msg.c +++ b/src/gras/Msg/msg.c @@ -2,63 +2,92 @@ /* messaging - Function related to messaging (code shared between RL and SG)*/ -/* Authors: Martin Quinson */ -/* Copyright (C) 2003 the OURAGAN project. */ +/* Copyright (c) 2003, 2004 Martin Quinson. 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "xbt/ex.h" #include "gras/Msg/msg_private.h" -#include "gras/DataDesc/datadesc_interface.h" -#include "gras/Transport/transport_interface.h" /* gras_trp_chunk_send/recv */ #include "gras/Virtu/virtu_interface.h" +#include "gras/DataDesc/datadesc_interface.h" +#include "gras/Transport/transport_interface.h" /* gras_select */ -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(msg,GRAS); +#define MIN(a,b) ((a) < (b) ? (a) : (b)) -gras_set_t *_gras_msgtype_set = NULL; -static char GRAS_header[6]; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg,gras,"High level messaging"); + +xbt_set_t _gras_msgtype_set = NULL; static char *make_namev(const char *name, short int ver); +char _GRAS_header[6]; -/** - * gras_msg_init: - * +/* + * Creating procdata for this module + */ +static void *gras_msg_procdata_new() { + gras_msg_procdata_t res = xbt_new(s_gras_msg_procdata_t,1); + + res->name = xbt_strdup("gras_msg"); + res->name_len = 0; + res->msg_queue = xbt_dynar_new(sizeof(s_gras_msg_t), NULL); + res->cbl_list = xbt_dynar_new(sizeof(gras_cblist_t *),gras_cbl_free); + res->timers = xbt_dynar_new(sizeof(s_gras_timer_t), NULL); + + return (void*)res; +} + +/* + * Freeing procdata for this module + */ +static void gras_msg_procdata_free(void *data) { + gras_msg_procdata_t res = (gras_msg_procdata_t)data; + + xbt_dynar_free(&( res->msg_queue )); + xbt_dynar_free(&( res->cbl_list )); + xbt_dynar_free(&( res->timers )); + + free(res); +} + +/* + * Module registration + */ +int gras_msg_libdata_id; +void gras_msg_register() { + gras_msg_libdata_id = gras_procdata_add("gras_msg",gras_msg_procdata_new, gras_msg_procdata_free); +} + +/* * Initialize this submodule. */ void gras_msg_init(void) { - gras_error_t errcode; - /* only initialize once */ if (_gras_msgtype_set != NULL) return; VERB0("Initializing Msg"); - TRYFAIL(gras_set_new(&_gras_msgtype_set)); + _gras_msgtype_set = xbt_set_new(); - memcpy(GRAS_header,"GRAS", 4); - GRAS_header[4]=GRAS_PROTOCOL_VERSION; - GRAS_header[5]=(char)GRAS_THISARCH; + memcpy(_GRAS_header,"GRAS", 4); + _GRAS_header[4]=GRAS_PROTOCOL_VERSION; + _GRAS_header[5]=(char)GRAS_THISARCH; } -/** - * gras_msg_exit: - * +/* * Finalize the msg module - **/ + */ void gras_msg_exit(void) { VERB0("Exiting Msg"); - gras_set_free(&_gras_msgtype_set); - _gras_msgtype_set = NULL; + xbt_set_free(&_gras_msgtype_set); } -/** - * gras_msgtype_free: - * +/* * Reclamed memory */ void gras_msgtype_free(void *t) { - gras_msgtype_t *msgtype=(gras_msgtype_t *)t; + gras_msgtype_t msgtype=(gras_msgtype_t)t; if (msgtype) { free(msgtype->name); free(msgtype); @@ -77,318 +106,321 @@ static char *make_namev(const char *name, short int ver) { if (!ver) return (char *)name; - namev = malloc(strlen(name)+2+3+1); + namev = (char*)xbt_malloc(strlen(name)+2+3+1); - if (namev) { + if (namev) sprintf(namev,"%s_v%d",name,ver); - } + return namev; } -/** - * gras_msgtype_declare: - * @name: name as it should be used for logging messages (must be uniq) - * @payload: datadescription of the payload +/** @brief declare a new message type of the given name. It only accepts the given datadesc as payload * - * Registers a message to the GRAS mecanism. + * @param name: name as it should be used for logging messages (must be uniq) + * @param payload: datadescription of the payload */ -gras_error_t -gras_msgtype_declare(const char *name, - gras_datadesc_type_t *payload) { - return gras_msgtype_declare_v(name, 0, payload); +void gras_msgtype_declare(const char *name, + gras_datadesc_type_t payload) { + gras_msgtype_declare_v(name, 0, payload); } -/** - * gras_msgtype_declare_v: - * @name: name as it should be used for logging messages (must be uniq) - * @version: something like versionning symbol - * @payload: datadescription of the payload +/** @brief declare a new versionned message type of the given name and payload * - * Registers a message to the GRAS mecanism. Use this version instead of + * @param name: name as it should be used for logging messages (must be uniq) + * @param version: something like versionning symbol + * @param payload: datadescription of the payload + * + * Registers a message to the GRAS mechanism. Use this version instead of * gras_msgtype_declare when you change the semantic or syntax of a message and * want your programs to be able to deal with both versions. Internally, each * will be handled as an independent message type, so you can register * differents for each of them. */ -gras_error_t -gras_msgtype_declare_v(const char *name, - short int version, - gras_datadesc_type_t *payload) { +void +gras_msgtype_declare_v(const char *name, + short int version, + gras_datadesc_type_t payload) { - gras_error_t errcode; - gras_msgtype_t *msgtype; + gras_msgtype_t msgtype=NULL; char *namev=make_namev(name,version); + volatile int found = 0; + xbt_ex_t e; - if (!namev) - RAISE_MALLOC; - - errcode = gras_set_get_by_name(_gras_msgtype_set, - namev,(gras_set_elm_t**)&msgtype); + TRY { + msgtype = (gras_msgtype_t)xbt_set_get_by_name(_gras_msgtype_set,namev); + found = 1; + } CATCH(e) { + if (e.category != not_found_error) + RETHROW; + xbt_ex_free(e); + } - if (errcode == no_error) { + if (found) { VERB2("Re-register version %d of message '%s' (same payload, ignored).", version, name); - gras_assert3(!gras_datadesc_type_cmp(msgtype->ctn_type, payload), + xbt_assert3(!gras_datadesc_type_cmp(msgtype->ctn_type, payload), "Message %s re-registred with another payload (%s was %s)", namev,gras_datadesc_get_name(payload), gras_datadesc_get_name(msgtype->ctn_type)); - return no_error; /* do really ignore it */ + return ; /* do really ignore it */ - } else if (errcode == mismatch_error) { - INFO3("Register version %d of message '%s' (payload: %s).", - version, name, gras_datadesc_get_name(payload)); - } else { - return errcode; /* Was expecting for mismatch_error */ } - if (! (msgtype = malloc(sizeof(gras_msgtype_t))) ) - RAISE_MALLOC; + VERB3("Register version %d of message '%s' (payload: %s).", + version, name, gras_datadesc_get_name(payload)); + msgtype = xbt_new(s_gras_msgtype_t,1); msgtype->name = (namev == name ? strdup(name) : namev); msgtype->name_len = strlen(namev); msgtype->version = version; msgtype->ctn_type = payload; - TRY(gras_set_add(_gras_msgtype_set, (gras_set_elm_t*)msgtype, - &gras_msgtype_free)); - - return no_error; + xbt_set_add(_gras_msgtype_set, (xbt_set_elm_t)msgtype, + &gras_msgtype_free); } -/** - * gras_msgtype_by_name: - * - * Retrieve a datatype description from its name - */ -gras_msgtype_t * gras_msgtype_by_name (const char *name) { +/** @brief retrive an existing message type from its name. */ +gras_msgtype_t gras_msgtype_by_name (const char *name) { return gras_msgtype_by_namev(name,0); } -/** - * gras_msgtype_by_namev: - * - * Retrieve a datatype description from its name and version - */ -gras_msgtype_t * gras_msgtype_by_namev(const char *name, - short int version) { - gras_msgtype_t *res; - gras_error_t errcode; +/** @brief retrive an existing message type from its name and version. */ +gras_msgtype_t gras_msgtype_by_namev(const char *name, + short int version) { + gras_msgtype_t res; char *namev = make_namev(name,version); - errcode = gras_set_get_by_name(_gras_msgtype_set, namev, - (gras_set_elm_t**)&res); - if (errcode != no_error) - res = NULL; + res = (gras_msgtype_t)xbt_set_get_by_name(_gras_msgtype_set, namev); if (name != namev) free(namev); return res; } - -/** - * gras_msg_send: - * - * Send the given message on the given socket - */ -gras_error_t -gras_msg_send(gras_socket_t *sock, - gras_msgtype_t *msgtype, - void *payload) { - - gras_error_t errcode; - static gras_datadesc_type_t *string_type=NULL; - - if (!msgtype) - RAISE0(mismatch_error, - "Cannot send the NULL message (did msgtype_by_name fail?)"); - - if (!string_type) { - string_type = gras_datadesc_by_name("string"); - gras_assert(string_type); - } - - DEBUG3("send '%s' to %s:%d", msgtype->name, - gras_socket_peer_name(sock),gras_socket_peer_port(sock)); - TRY(gras_trp_chunk_send(sock, GRAS_header, 6)); - - TRY(gras_datadesc_send(sock, string_type, &msgtype->name)); - TRY(gras_datadesc_send(sock, msgtype->ctn_type, payload)); - TRY(gras_trp_flush(sock)); - - return no_error; +/** @brief retrive an existing message type from its name and version. */ +gras_msgtype_t gras_msgtype_by_id(int id) { + return (gras_msgtype_t)xbt_set_get_by_id(_gras_msgtype_set, id); } -/** - * gras_msg_recv: - * - * receive the next message on the given socket. - */ -gras_error_t -gras_msg_recv(gras_socket_t *sock, - gras_msgtype_t **msgtype, - void **payload, - int *payload_size) { - - gras_error_t errcode; - static gras_datadesc_type_t *string_type=NULL; - char header[6]; - int cpt; - int r_arch; - char *msg_name=NULL; - if (!string_type) { - string_type=gras_datadesc_by_name("string"); - gras_assert(string_type); - } - - TRY(gras_trp_chunk_recv(sock, header, 6)); - for (cpt=0; cpt<4; cpt++) - if (header[cpt] != GRAS_header[cpt]) - RAISE0(mismatch_error,"Incoming bytes do not look like a GRAS message"); - if (header[4] != GRAS_header[4]) - RAISE2(mismatch_error,"GRAS protocol mismatch (got %d, use %d)", - (int)header[4], (int)GRAS_header[4]); - r_arch = (int)header[5]; - DEBUG2("Handle an incoming message using protocol %d (remote is %s)", - (int)header[4],gras_datadesc_arch_name(r_arch)); - - TRY(gras_datadesc_recv(sock, string_type, r_arch, &msg_name)); - errcode = gras_set_get_by_name(_gras_msgtype_set, - msg_name,(gras_set_elm_t**)msgtype); - if (errcode != no_error) - RAISE2(errcode, - "Got error %s while retrieving the type associated to messages '%s'", - gras_error_name(errcode),msg_name); - /* FIXME: Survive unknown messages */ - free(msg_name); - - *payload_size=gras_datadesc_size((*msgtype)->ctn_type); - gras_assert2(*payload_size > 0, - "%s %s", - "Dynamic array as payload is forbided for now (FIXME?).", - "Reference to dynamic array is allowed."); - *payload = malloc(*payload_size); - TRY(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload)); - - return no_error; -} - -/** - * gras_msg_wait: - * @timeout: How long should we wait for this message. - * @id: id of awaited msg - * @Returns: the error code (or no_error). +/** \brief Waits for a message to come in over a given socket. * - * Waits for a message to come in over a given socket. + * @param timeout: How long should we wait for this message. + * @param msgt_want: type of awaited msg (or NULL if I'm enclined to accept any message) + * @param expe_want: awaited expeditot (match on hostname, not port; NULL if not relevant) + * @param payl_filter: function returning true or false when passed a payload. Messages for which it returns false are not selected. (NULL if not relevant) + * @param filter_ctx: context passed as second argument of the filter (a pattern to match?) + * @param[out] msgt_got: where to write the descriptor of the message we got + * @param[out] expe_got: where to create a socket to answer the incomming message + * @param[out] payl_got: where to write the payload of the incomming message * * Every message of another type received before the one waited will be queued - * and used by subsequent call to this function or MsgHandle(). + * and used by subsequent call to this function or gras_msg_handle(). */ -gras_error_t -gras_msg_wait(double timeout, - gras_msgtype_t *msgt_want, - gras_socket_t **expeditor, - void *payload) { - - gras_msgtype_t *msgt_got; - void *payload_got; - int payload_size_got; - gras_error_t errcode; + +void +gras_msg_wait_ext(double timeout, + gras_msgtype_t msgt_want, + gras_socket_t expe_want, + int_f_pvoid_pvoid_t payl_filter, + void *filter_ctx, + gras_msgtype_t *msgt_got, + gras_socket_t *expe_got, + void *payl_got) { + + s_gras_msg_t msg; double start, now; - gras_procdata_t *pd=gras_procdata_get(); + gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id); int cpt; - gras_msg_t msg; - - *expeditor = NULL; - payload_got = NULL; - if (!msgt_want) - RAISE0(mismatch_error, - "Cannot wait for the NULL message (did msgtype_by_name fail?)"); + xbt_assert0(msgt_want,"Cannot wait for the NULL message"); - VERB1("Waiting for message %s",msgt_want->name); + VERB1("Waiting for message '%s'",msgt_want->name); start = now = gras_os_time(); - gras_dynar_foreach(pd->msg_queue,cpt,msg){ - if (msg.type->code == msgt_want->code) { - *expeditor = msg.expeditor; - memcpy(payload, msg.payload, msg.payload_size); - free(msg.payload); - gras_dynar_cursor_rm(pd->msg_queue, &cpt); + xbt_dynar_foreach(pd->msg_queue,cpt,msg){ + if ( ( !msgt_want || (msg.type->code == msgt_want->code)) + && (!expe_want || (!strcmp( gras_socket_peer_name(msg.expe), + gras_socket_peer_name(expe_want)))) + && (!payl_filter || payl_filter(msg.payl,filter_ctx))) { + + if (expe_got) + *expe_got = msg.expe; + if (msgt_got) + *msgt_got = msg.type; + if (payl_got) + memcpy(payl_got, msg.payl, msg.payl_size); + free(msg.payl); + xbt_dynar_cursor_rm(pd->msg_queue, &cpt); VERB0("The waited message was queued"); - return no_error; + return; } } while (1) { - TRY(gras_trp_select(timeout - now + start, expeditor)); - TRY(gras_msg_recv(*expeditor, &msgt_got, &payload_got, &payload_size_got)); - if (msgt_got->code == msgt_want->code) { - memcpy(payload, payload_got, payload_size_got); - free(payload_got); - VERB0("Got waited message"); - return no_error; + memset(&msg,sizeof(msg),0); + + msg.expe = gras_trp_select(timeout - now + start); + gras_msg_recv(msg.expe, &msg); + + if ( ( !msgt_want || (msg.type->code == msgt_want->code)) + && (!expe_want || (!strcmp( gras_socket_peer_name(msg.expe), + gras_socket_peer_name(expe_want)))) + && (!payl_filter || payl_filter(msg.payl,filter_ctx))) { + + if (expe_got) + *expe_got=msg.expe; + if (msgt_got) + *msgt_got = msg.type; + if (payl_got) + memcpy(payl_got, msg.payl, msg.payl_size); + free(msg.payl); + return; } /* not expected msg type. Queue it for later */ - msg.expeditor = *expeditor; - msg.type = msgt_got; - msg.payload = payload; - msg.payload_size = payload_size_got; - TRY(gras_dynar_push(pd->msg_queue,&msg)); + xbt_dynar_push(pd->msg_queue,&msg); now=gras_os_time(); if (now - start + 0.001 < timeout) { - RAISE1(timeout_error,"Timeout while waiting for msg %s",msgt_want->name); + THROW1(timeout_error, now-start+0.001-timeout, + "Timeout while waiting for msg %s",msgt_want->name); } } - RAISE_IMPOSSIBLE; + THROW_IMPOSSIBLE; +} +/** \brief Waits for a message to come in over a given socket. + * + * @param timeout: How long should we wait for this message. + * @param msgt_want: type of awaited msg + * @param[out] expeditor: where to create a socket to answer the incomming message + * @param[out] payload: where to write the payload of the incomming message + * @return the error code (or no_error). + * + * Every message of another type received before the one waited will be queued + * and used by subsequent call to this function or gras_msg_handle(). + */ +void +gras_msg_wait(double timeout, + gras_msgtype_t msgt_want, + gras_socket_t *expeditor, + void *payload) { + + return gras_msg_wait_ext(timeout, + msgt_want, NULL, NULL, NULL, + NULL, expeditor, payload); } -/** - * gras_msg_handle: - * @timeOut: How long to wait for incoming messages - * @Returns: the error code (or no_error). + +/** \brief Send the data pointed by \a payload as a message of type + * \a msgtype to the peer \a sock */ +void +gras_msg_send(gras_socket_t sock, + gras_msgtype_t msgtype, + void *payload) { + + gras_msg_send_ext(sock, e_gras_msg_kind_oneway, msgtype, payload); +} + +/** @brief Handle an incomming message or timer (or wait up to \a timeOut seconds) + * + * @param timeOut: How long to wait for incoming messages (in seconds) + * @return the error code (or no_error). * - * Waits up to #timeOut# seconds to see if a message comes in; if so, calls the - * registered listener for that message (see RegisterCallback()). + * Messages are passed to the callbacks. */ -gras_error_t +void gras_msg_handle(double timeOut) { - gras_error_t errcode; + double untiltimer; + int cpt; - gras_msg_t msg; - gras_socket_t *expeditor; + s_gras_msg_t msg; + gras_socket_t expeditor=NULL; void *payload=NULL; - int payload_size; - gras_msgtype_t *msgtype; - - gras_procdata_t*pd=gras_procdata_get(); - gras_cblist_t *list; - gras_cb_t cb; - + gras_msgtype_t msgtype=NULL; + gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id); + gras_cblist_t *list=NULL; + gras_msg_cb_t cb; + + int timerexpected, timeouted; + xbt_ex_t e; VERB1("Handling message within the next %.2fs",timeOut); + untiltimer = gras_msg_timer_handle(); + DEBUG2("[%.0f] Next timer in %f sec", gras_os_time(), untiltimer); + if (untiltimer == 0.0) { + /* A timer was already elapsed and handled */ + return; + } + if (untiltimer != -1.0) { + timerexpected = 1; + timeOut = MIN(timeOut, untiltimer); + } else { + timerexpected = 0; + } + /* get a message (from the queue or from the net) */ - if (gras_dynar_length(pd->msg_queue)) { - gras_dynar_shift(pd->msg_queue,&msg); - expeditor = msg.expeditor; + timeouted = 0; + if (xbt_dynar_length(pd->msg_queue)) { + DEBUG0("Get a message from the queue"); + xbt_dynar_shift(pd->msg_queue,&msg); + expeditor = msg.expe; msgtype = msg.type; - payload = msg.payload; - + payload = msg.payl; } else { - TRY(gras_trp_select(timeOut, &expeditor)); - TRY(gras_msg_recv(expeditor, &msgtype, &payload, &payload_size)); + TRY { + expeditor = gras_trp_select(timeOut); + } CATCH(e) { + if (e.category != timeout_error) + RETHROW; + xbt_ex_free(e); + timeouted = 1; + } + + if (!timeouted) { + TRY { + /* FIXME: if not the right kind, queue it and recall ourself or goto >:-) */ + gras_msg_recv(expeditor, &msg); + msgtype = msg.type; + payload = msg.payl; + } CATCH(e) { + RETHROW1("Error caught while receiving a message on select()ed socket %p: %s", + expeditor); + } + } } - - /* handle it */ - gras_dynar_foreach(pd->cbl_list,cpt,list) { + + if (timeouted) { + if (timerexpected) { + + /* A timer elapsed before the arrival of any message even if we select()ed a bit */ + untiltimer = gras_msg_timer_handle(); + if (untiltimer == 0.0) { + /* we served a timer, we're done */ + return; + } else { + xbt_assert1(untiltimer>0, "Negative timer (%f). I'm 'puzzeled'", untiltimer); + WARN1("No timer elapsed, in contrary to expectations (next in %f sec)", + untiltimer); + THROW1(timeout_error,0, + "No timer elapsed, in contrary to expectations (next in %f sec)", + untiltimer); + } + + } else { + /* select timeouted, and no timer elapsed. Nothing to do */ + THROW0(timeout_error, 0, "No new message or timer"); + } + + } + + /* A message was already there or arrived in the meanwhile. handle it */ + xbt_dynar_foreach(pd->cbl_list,cpt,list) { if (list->id == msgtype->code) { break; } else { @@ -399,45 +431,50 @@ gras_msg_handle(double timeOut) { INFO1("No callback for the incomming '%s' message. Discarded.", msgtype->name); WARN0("FIXME: gras_datadesc_free not implemented => leaking the payload"); - return no_error; + return; } - gras_dynar_foreach(list->cbs,cpt,cb) { - INFO3("Invoque the callback #%d (@%p) for incomming msg %s", - cpt+1,cb,msgtype->name); + xbt_dynar_foreach(list->cbs,cpt,cb) { + VERB3("Use the callback #%d (@%p) for incomming msg %s", + cpt+1,cb,msgtype->name); if ((*cb)(expeditor,payload)) { /* cb handled the message */ free(payload); - return no_error; + return; } } - INFO1("Message '%s' refused by all registered callbacks", msgtype->name); - WARN0("FIXME: gras_datadesc_free not implemented => leaking the payload"); - return mismatch_error; + /* FIXME: gras_datadesc_free not implemented => leaking the payload */ + THROW1(mismatch_error,0, + "Message '%s' refused by all registered callbacks", msgtype->name); } void gras_cbl_free(void *data){ gras_cblist_t *list=*(void**)data; if (list) { - gras_dynar_free(list->cbs); + xbt_dynar_free(&( list->cbs )); free(list); } } -gras_error_t -gras_cb_register(gras_msgtype_t *msgtype, - gras_cb_t cb) { - gras_error_t errcode; - gras_procdata_t *pd=gras_procdata_get(); +/** \brief Bind the given callback to the given message type + * + * Several callbacks can be attached to a given message type. The lastly added one will get the message first, and + * if it returns false, the message will be passed to the second one. + * And so on until one of the callbacks accepts the message. + */ +void +gras_cb_register(gras_msgtype_t msgtype, + gras_msg_cb_t cb) { + gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id); gras_cblist_t *list=NULL; int cpt; - DEBUG2("Register %p as callback to %s",cb,msgtype->name); + DEBUG2("Register %p as callback to '%s'",cb,msgtype->name); /* search the list of cb for this message on this host (creating if NULL) */ - gras_dynar_foreach(pd->cbl_list,cpt,list) { + xbt_dynar_foreach(pd->cbl_list,cpt,list) { if (list->id == msgtype->code) { break; } else { @@ -446,33 +483,29 @@ gras_cb_register(gras_msgtype_t *msgtype, } if (!list) { /* First cb? Create room */ - list = malloc(sizeof(gras_cblist_t)); - if (!list) - RAISE_MALLOC; - + list = xbt_new(gras_cblist_t,1); list->id = msgtype->code; - TRY(gras_dynar_new(&(list->cbs), sizeof(gras_cb_t), NULL)); - TRY(gras_dynar_push(pd->cbl_list,&list)); + list->cbs = xbt_dynar_new(sizeof(gras_msg_cb_t), NULL); + xbt_dynar_push(pd->cbl_list,&list); } /* Insert the new one into the set */ - TRY(gras_dynar_insert_at(list->cbs,0,&cb)); - - return no_error; + xbt_dynar_insert_at(list->cbs,0,&cb); } +/** \brief Unbind the given callback from the given message type */ void -gras_cb_unregister(gras_msgtype_t *msgtype, - gras_cb_t cb) { +gras_cb_unregister(gras_msgtype_t msgtype, + gras_msg_cb_t cb) { - gras_procdata_t *pd=gras_procdata_get(); + gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id); gras_cblist_t *list; - gras_cb_t cb_cpt; + gras_msg_cb_t cb_cpt; int cpt; int found = 0; /* search the list of cb for this message on this host */ - gras_dynar_foreach(pd->cbl_list,cpt,list) { + xbt_dynar_foreach(pd->cbl_list,cpt,list) { if (list->id == msgtype->code) { break; } else { @@ -482,9 +515,9 @@ gras_cb_unregister(gras_msgtype_t *msgtype, /* Remove it from the set */ if (list) { - gras_dynar_foreach(list->cbs,cpt,cb_cpt) { + xbt_dynar_foreach(list->cbs,cpt,cb_cpt) { if (cb == cb_cpt) { - gras_dynar_cursor_rm(list->cbs, &cpt); + xbt_dynar_cursor_rm(list->cbs, &cpt); found = 1; } }