xbt_dynar_free(&( res->msg_queue ));
xbt_dynar_free(&( res->cbl_list ));
xbt_dynar_free(&( res->timers ));
+
+ free(res);
}
/*
xbt_error_t errcode;
gras_msgtype_t msgtype;
char *namev=make_namev(name,version);
-
+
errcode = xbt_set_get_by_name(_gras_msgtype_set,
namev,(xbt_set_elm_t*)&msgtype);
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));
+ TRYOLD(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));
+ TRYOLD(gras_datadesc_send(sock, string_type, &msgtype->name));
+ if (msgtype->ctn_type)
+ TRYOLD(gras_datadesc_send(sock, msgtype->ctn_type, payload));
+ TRYOLD(gras_trp_flush(sock));
return no_error;
}
int r_arch;
char *msg_name=NULL;
+ xbt_assert1(!gras_socket_is_meas(sock),
+ "Asked to receive a message on the measurement socket %p", sock);
if (!string_type) {
string_type=gras_datadesc_by_name("string");
xbt_assert(string_type);
}
- TRY(gras_trp_chunk_recv(sock, header, 6));
+ errcode=gras_trp_chunk_recv(sock, header, 6);
+ if (errcode!=no_error)
+ RAISE2(errcode,"Got '%s' while trying to get the mesage header on socket %p",
+ xbt_error_name(errcode),sock);
for (cpt=0; cpt<4; cpt++)
if (header[cpt] != GRAS_header[cpt])
- RAISE0(mismatch_error,"Incoming bytes do not look like a GRAS message");
+ RAISE2(mismatch_error,"Incoming bytes do not look like a GRAS message (header='%.4s' not '%.4s')",header,GRAS_header);
if (header[4] != GRAS_header[4])
RAISE2(mismatch_error,"GRAS protocol mismatch (got %d, use %d)",
(int)header[4], (int)GRAS_header[4]);
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));
+ TRYOLD(gras_datadesc_recv(sock, string_type, r_arch, &msg_name));
errcode = xbt_set_get_by_name(_gras_msgtype_set,
msg_name,(xbt_set_elm_t*)msgtype);
if (errcode != no_error)
/* FIXME: Survive unknown messages */
free(msg_name);
- *payload_size=gras_datadesc_size((*msgtype)->ctn_type);
- xbt_assert2(*payload_size > 0,
- "%s %s",
- "Dynamic array as payload is forbided for now (FIXME?).",
- "Reference to dynamic array is allowed.");
- *payload = xbt_malloc(*payload_size);
- TRY(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload));
-
+ if ((*msgtype)->ctn_type) {
+ *payload_size=gras_datadesc_size((*msgtype)->ctn_type);
+ xbt_assert2(*payload_size > 0,
+ "%s %s",
+ "Dynamic array as payload is forbided for now (FIXME?).",
+ "Reference to dynamic array is allowed.");
+ *payload = xbt_malloc(*payload_size);
+ TRYOLD(gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload));
+ } else {
+ *payload = NULL;
+ *payload_size = 0;
+ }
return no_error;
}
gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
int cpt;
s_gras_msg_t msg;
+ gras_socket_t expeditor_res = NULL;
- *expeditor = NULL;
payload_got = NULL;
if (!msgt_want)
RAISE0(mismatch_error,
"Cannot wait for the NULL message (did msgtype_by_name fail?)");
- VERB1("Waiting for message %s",msgt_want->name);
+ VERB1("Waiting for message '%s'",msgt_want->name);
start = now = gras_os_time();
xbt_dynar_foreach(pd->msg_queue,cpt,msg){
if (msg.type->code == msgt_want->code) {
- *expeditor = msg.expeditor;
+ if (expeditor)
+ *expeditor = msg.expeditor;
memcpy(payload, msg.payload, msg.payload_size);
free(msg.payload);
xbt_dynar_cursor_rm(pd->msg_queue, &cpt);
}
while (1) {
- TRY(gras_trp_select(timeout - now + start, expeditor));
- TRY(gras_msg_recv(*expeditor, &msgt_got, &payload_got, &payload_size_got));
+ TRYOLD(gras_trp_select(timeout - now + start, &expeditor_res));
+ TRYOLD(gras_msg_recv(expeditor_res, &msgt_got, &payload_got, &payload_size_got));
if (msgt_got->code == msgt_want->code) {
+ if (expeditor)
+ *expeditor=expeditor_res;
memcpy(payload, payload_got, payload_size_got);
free(payload_got);
VERB0("Got waited message");
}
/* not expected msg type. Queue it for later */
- msg.expeditor = *expeditor;
- msg.type = msgt_got;
- msg.payload = payload;
+ msg.expeditor = expeditor_res;
+ msg.type = msgt_got;
+ msg.payload = payload;
msg.payload_size = payload_size_got;
xbt_dynar_push(pd->msg_queue,&msg);
/** @brief Handle an incomming message or timer (or wait up to \a timeOut seconds)
*
- * @param timeOut: How long to wait for incoming messages
+ * @param timeOut: How long to wait for incoming messages (in seconds)
* @return the error code (or no_error).
*
* Messages are passed to the callbacks.
gras_msgtype_t msgtype;
gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
- gras_cblist_t *list;
+ gras_cblist_t *list=NULL;
gras_msg_cb_t cb;
+
+ int timerexpected;
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 */
+ /* A timer was already elapsed and handled */
return no_error;
}
+ if (untiltimer != -1.0) {
+ timerexpected = 1;
+ timeOut = MIN(timeOut, untiltimer);
+ } else {
+ timerexpected = 0;
+ }
/* get a message (from the queue or from the net) */
if (xbt_dynar_length(pd->msg_queue)) {
+ DEBUG0("Get a message from the queue");
xbt_dynar_shift(pd->msg_queue,&msg);
expeditor = msg.expeditor;
msgtype = msg.type;
payload = msg.payload;
errcode = no_error;
} else {
- errcode = gras_trp_select(MIN(timeOut,untiltimer), &expeditor);
+ errcode = gras_trp_select(timeOut, &expeditor);
if (errcode != no_error && errcode != timeout_error)
return errcode;
- if (errcode != timeout_error)
- TRY(gras_msg_recv(expeditor, &msgtype, &payload, &payload_size));
+ if (errcode == no_error) {
+ errcode = gras_msg_recv(expeditor, &msgtype, &payload, &payload_size);
+ if (errcode != no_error)
+ RAISE2(errcode, "Error '%s' while receiving a message on select()ed socket %p",
+ xbt_error_name(errcode),expeditor);
+ }
}
- if (errcode == timeout_error && untiltimer < timeOut) {
- /* 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) {
- return no_error;
+ if (errcode == timeout_error ) {
+ 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) {
+ return no_error;
+ } 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);
+ return timeout_error;
+ }
+
} else {
- WARN1("Weird. I computed that a timer should elapse shortly, but none did (I still should wait %f sec)",
- untiltimer);
+ /* select timeouted, and no timer elapsed. Nothing to do */
return timeout_error;
}
+
}
/* A message was already there or arrived in the meanwhile. handle it */
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) */
xbt_dynar_foreach(pd->cbl_list,cpt,list) {
