X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d8c0d29800852cbaf1a2fc70631994365ba4668..5ce5e2ee7fd0dd8344be0823d7bd7c4abb16b284:/src/gras/Msg/msg.c?ds=sidebyside diff --git a/src/gras/Msg/msg.c b/src/gras/Msg/msg.c index c3d3f50927..a041dba75b 100644 --- a/src/gras/Msg/msg.c +++ b/src/gras/Msg/msg.c @@ -79,6 +79,12 @@ void gras_msg_init(void) { memcpy(_GRAS_header,"GRAS", 4); _GRAS_header[4]=GRAS_PROTOCOL_VERSION; _GRAS_header[5]=(char)GRAS_THISARCH; + + gras_msg_ctx_mallocator = + xbt_mallocator_new(1000, + gras_msg_ctx_mallocator_new_f, + gras_msg_ctx_mallocator_free_f, + gras_msg_ctx_mallocator_reset_f); } /* @@ -88,6 +94,8 @@ void gras_msg_exit(void) { VERB0("Exiting Msg"); xbt_set_free(&_gras_msgtype_set); + + xbt_mallocator_free(gras_msg_ctx_mallocator); } /* @@ -100,6 +108,23 @@ void gras_msgtype_free(void *t) { free(msgtype); } } +/** + * Dump all declared message types (debugging purpose) + */ +void gras_msgtype_dumpall(void) { + xbt_set_cursor_t cursor; + gras_msgtype_t msgtype=NULL; + + INFO0("Dump of all registered messages:"); + xbt_set_foreach(_gras_msgtype_set, cursor, msgtype) { + INFO6(" 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), + (msgtype->kind==e_gras_msg_kind_rpccall ? " -> ":""), + (msgtype->kind==e_gras_msg_kind_rpccall ? gras_datadesc_get_name(msgtype->answer_type) : "")); + } +} + /** * make_namev: @@ -214,24 +239,41 @@ gras_msgtype_declare_v(const char *name, e_gras_msg_kind_oneway, payload, NULL); } -/** @brief retrieve an existing message type from its name. */ +/** @brief retrieve an existing message type from its name (raises an exception if it does not exist). */ gras_msgtype_t gras_msgtype_by_name (const char *name) { return gras_msgtype_by_namev(name,0); } +/** @brief retrieve an existing message type from its name (or NULL if it does not exist). */ +gras_msgtype_t gras_msgtype_by_name_or_null (const char *name) { + xbt_ex_t e; + gras_msgtype_t res = NULL; + + TRY { + res = gras_msgtype_by_namev(name,0); + } CATCH(e) { + res = NULL; + xbt_ex_free(e); + } + return res; +} /** @brief retrieve 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 = NULL; - char *namev = make_namev(name,version); + 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); - THROW1(not_found_error,0,"No registred message of that name: %s",name); } + if (!found) + THROW1(not_found_error,0,"No registred message of that name: %s",name); + if (name != namev) free(namev); @@ -272,10 +314,9 @@ gras_msg_wait_ext(double timeout, xbt_assert0(msg_got,"msg_got is an output parameter"); + start = gras_os_time(); VERB1("Waiting for message '%s'",msgt_want?msgt_want->name:"(any)"); - start = now = gras_os_time(); - 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), @@ -290,10 +331,30 @@ gras_msg_wait_ext(double timeout, } while (1) { + int need_restart; + xbt_ex_t e; + + restart_receive: /* Goto here when the receive of a message failed */ + need_restart=0; + now=gras_os_time(); memset(&msg,sizeof(msg),0); - msg.expe = gras_trp_select(timeout ? timeout - now + start : 0); - gras_msg_recv(msg.expe, &msg); + TRY { + msg.expe = gras_trp_select(timeout ? timeout - now + start : 0); + gras_msg_recv(msg.expe, &msg); + } CATCH(e) { + if (e.category == system_error && + !strncmp("Socket closed by remote side",e.msg, + strlen("Socket closed by remote side"))) { + xbt_ex_free(e); + need_restart=1; + } else { + RETHROW; + } + } + if (need_restart) + goto restart_receive; + DEBUG0("Got a message from the socket"); if ( ( !msgt_want || (msg.type->code == msgt_want->code)) @@ -410,7 +471,8 @@ void gras_msg_wait_or(double timeout, } if (ctx) - *ctx=gras_msg_cb_ctx_new(msg.expe,msg.type,msg.ID,60); + *ctx=gras_msg_cb_ctx_new(msg.expe, msg.type, msg.ID, + (msg.kind == e_gras_msg_kind_rpccall), 60); if (msgt_got) *msgt_got = xbt_dynar_search(msgt_want,msg.type); @@ -459,7 +521,8 @@ gras_msg_handleall(double period) { do { now=gras_os_time(); TRY{ - gras_msg_handle(period - now + begin); + if (period - now + begin > 0) + gras_msg_handle(period - now + begin); } CATCH(e) { if (e.category != timeout_error) RETHROW0("Error while waiting for messages: %s"); @@ -467,6 +530,7 @@ gras_msg_handleall(double period) { } } while (now - begin < period); } + /** @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) @@ -479,7 +543,8 @@ gras_msg_handle(double timeOut) { double untiltimer; - int cpt, ran_ok; + int cpt; + int volatile ran_ok; s_gras_msg_t msg; @@ -581,6 +646,7 @@ gras_msg_handle(double timeOut) { ctx.expeditor = msg.expe; ctx.ID = msg.ID; ctx.msgtype = msg.type; + ctx.answer_due = (msg.kind == e_gras_msg_kind_rpccall); switch (msg.kind) { case e_gras_msg_kind_oneway: @@ -615,11 +681,15 @@ gras_msg_handle(double timeOut) { gras_msg_send_ext(msg.expe, e_gras_msg_kind_rpcerror, msg.ID, msg.type, &e); xbt_ex_free(e); + ctx.answer_due = 0; ran_ok=1; } else { RETHROW0("Callback raised an exception: %s"); } } + xbt_assert0(!(ctx.answer_due), + "RPC callback didn't call gras_msg_rpcreturn"); + if (!ran_ok) THROW1(mismatch_error,0, "Message '%s' refused by all registered callbacks", msg.type->name); @@ -730,12 +800,15 @@ gras_socket_t gras_msg_cb_ctx_from(gras_msg_cb_ctx_t ctx) { gras_msg_cb_ctx_t gras_msg_cb_ctx_new(gras_socket_t expe, gras_msgtype_t msgtype, unsigned long int ID, + int answer_due, double timeout) { gras_msg_cb_ctx_t res=xbt_new(s_gras_msg_cb_ctx_t,1); res->expeditor = expe; res->msgtype = msgtype; res->ID = ID; res->timeout = timeout; + res->answer_due = answer_due; + return res; } /* \brief Frees a message exchange context