X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ffdfad0dab5d005809b7732310c0ced8e4d393e1..62a02b51b60cd69b26262eae02423f1d7da31b43:/src/gras/Msg/msg.c diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c index 077f51c215..7390f13828 100644 --- a/src/gras/Msg/msg.c +++ b/src/gras/Msg/msg.c @@ -69,11 +69,13 @@ void gras_msgtype_free(void *t) { * the name unchanged. Pay attention to this before free'ing the result. */ static char *make_namev(const char *name, short int ver) { - char *namev=malloc(strlen(name)+2+3+1); + char *namev; if (!ver) return (char *)name; + namev = malloc(strlen(name)+2+3+1); + if (namev) { sprintf(namev,"%s_v%d",name,ver); } @@ -121,32 +123,34 @@ gras_msgtype_declare_v(const char *name, errcode = gras_set_get_by_name(_gras_msgtype_set, namev,(gras_set_elm_t**)&msgtype); - if (errcode == mismatch_error) { - /* create type */ - if (! (msgtype = malloc(sizeof(gras_msgtype_t))) ) - RAISE_MALLOC; - msgtype->name = (namev == name ? strdup(name) : namev); - msgtype->name_len = strlen(namev); - msgtype->version = version; - msgtype->ctn_type = payload; + if (errcode == no_error) { + VERB2("Re-register version %d of message '%s' (same payload, ignored).", + version, name); + gras_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)); + } 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 */ + } - TRY(gras_set_add(_gras_msgtype_set, (gras_set_elm_t*)msgtype, - &gras_msgtype_free)); + /* create type anyway so that the old type gets removed from here, and + hopefully free'd when ref counter gets 0 */ + if (! (msgtype = malloc(sizeof(gras_msgtype_t))) ) + RAISE_MALLOC; - DEBUG2("Register version %d of message '%s'.", version, name); - } else if (errcode == no_error) { /* found */ - if (namev != name) - free(namev); + msgtype->name = (namev == name ? strdup(name) : namev); + msgtype->name_len = strlen(namev); + msgtype->version = version; + msgtype->ctn_type = payload; + gras_datadesc_ref(payload); - gras_assert1(!gras_datadesc_type_cmp(msgtype->ctn_type, payload), - "Message %s registred again with a different payload", - namev); - } else { - if (namev != name) - free(namev); - return errcode; /* Error is set lookup */ - } + TRY(gras_set_add(_gras_msgtype_set, (gras_set_elm_t*)msgtype, + &gras_msgtype_free)); return no_error; } @@ -174,12 +178,12 @@ gras_msgtype_by_namev(const char *name, gras_error_t errcode; char *namev = make_namev(name,version); - TRY(gras_set_get_by_name(_gras_msgtype_set, namev, - (gras_set_elm_t**)dst)); + errcode = gras_set_get_by_name(_gras_msgtype_set, namev, + (gras_set_elm_t**)dst); if (name != namev) free(namev); - return no_error; + return errcode; } /** @@ -201,7 +205,7 @@ gras_msg_send(gras_socket_t *sock, TRY(gras_trp_chunk_send(sock, GRAS_header, 6)); - TRY(gras_datadesc_send(sock, string_type, msgtype->name)); + TRY(gras_datadesc_send(sock, string_type, &msgtype->name)); TRY(gras_datadesc_send(sock, msgtype->ctn_type, payload)); return no_error; @@ -209,20 +213,20 @@ gras_msg_send(gras_socket_t *sock, /** * gras_msg_recv: * - * receive the next message on the given socket (which should be dropped - * when the function returns an error) + * receive the next message on the given socket. */ gras_error_t gras_msg_recv(gras_socket_t *sock, gras_msgtype_t **msgtype, - void **payload) { - + 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; + char *msg_name=NULL; if (!string_type) { string_type=gras_datadesc_by_name("string"); @@ -237,11 +241,21 @@ gras_msg_recv(gras_socket_t *sock, 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 from arch %s", + (int)header[4],gras_datadesc_arch_name(r_arch)); - TRY(gras_datadesc_recv(sock, string_type, r_arch,(void**) &msg_name)); + TRY(gras_datadesc_recv(sock, string_type, r_arch, &msg_name)); TRY(gras_set_get_by_name(_gras_msgtype_set, msg_name,(gras_set_elm_t**)msgtype)); - TRY(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, payload)); + 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; } @@ -261,9 +275,11 @@ gras_error_t gras_msg_wait(double timeout, gras_msgtype_t *msgt_want, gras_socket_t **expeditor, - void **payload) { + void *payload) { gras_msgtype_t *msgt_got; + void *payload_got; + int payload_size_got; gras_error_t errcode; double start, now; gras_procdata_t *pd=gras_procdata_get(); @@ -271,7 +287,7 @@ gras_msg_wait(double timeout, gras_msg_t msg; *expeditor = NULL; - *payload = NULL; + payload_got = NULL; VERB1("Waiting for message %s",msgt_want->name); @@ -280,17 +296,20 @@ gras_msg_wait(double timeout, gras_dynar_foreach(pd->msg_queue,cpt,msg){ if (msg.type->code == msgt_want->code) { *expeditor = msg.expeditor; - *payload = msg.payload; + memcpy(payload, msg.payload, msg.payload_size); + free(msg.payload); gras_dynar_cursor_rm(pd->msg_queue, &cpt); - VERB0("Waited message was queued"); + VERB0("The waited message was queued"); return no_error; } } while (1) { TRY(gras_trp_select(timeout - now + start, expeditor)); - TRY(gras_msg_recv(*expeditor, &msgt_got, payload)); + 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; } @@ -298,7 +317,8 @@ gras_msg_wait(double timeout, /* not expected msg type. Queue it for later */ msg.expeditor = *expeditor; msg.type = msgt_got; - msg.payload = *payload; + msg.payload = payload; + msg.payload_size = payload_size_got; TRY(gras_dynar_push(pd->msg_queue,&msg)); now=gras_time(); @@ -326,7 +346,8 @@ gras_msg_handle(double timeOut) { gras_msg_t msg; gras_socket_t *expeditor; - void *payload; + void *payload=NULL; + int payload_size; gras_msgtype_t *msgtype; gras_procdata_t*pd=gras_procdata_get(); @@ -335,7 +356,7 @@ gras_msg_handle(double timeOut) { - VERB1("Handling message within the next %d",timeOut); + VERB1("Handling message within the next %.2fs",timeOut); /* get a message (from the queue or from the net) */ if (gras_dynar_length(pd->msg_queue)) { @@ -346,7 +367,7 @@ gras_msg_handle(double timeOut) { } else { TRY(gras_trp_select(timeOut, &expeditor)); - TRY(gras_msg_recv(expeditor, &msgtype, &payload)); + TRY(gras_msg_recv(expeditor, &msgtype, &payload, &payload_size)); } /* handle it */ @@ -358,14 +379,18 @@ gras_msg_handle(double timeOut) { } } if (!list) { - INFO1("Unexpected message '%s' ignored", msgtype->name); + INFO1("No callback for the incomming '%s' message. Discarded.", + msgtype->name); WARN0("FIXME: gras_datadesc_free not implemented => leaking the payload"); return no_error; } gras_dynar_foreach(list->cbs,cpt,cb) { - if (cb(expeditor,msgtype->ctn_type,payload)) { + INFO3("Invoque 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; } } @@ -380,9 +405,11 @@ gras_cb_register(gras_msgtype_t *msgtype, gras_cb_t cb) { gras_error_t errcode; gras_procdata_t *pd=gras_procdata_get(); - gras_cblist_t *list; + gras_cblist_t *list=NULL; int cpt; + 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) { if (list->id == msgtype->code) { @@ -403,7 +430,7 @@ gras_cb_register(gras_msgtype_t *msgtype, } /* Insert the new one into the set */ - TRY(gras_dynar_insert_at(list->cbs,0,cb)); + TRY(gras_dynar_insert_at(list->cbs,0,&cb)); return no_error; }