e_gras_msg_kind_oneway, payload, NULL);
}
-/** @brief retrive an existing message type from its name. */
+/** @brief retrieve an existing message type from its name. */
gras_msgtype_t gras_msgtype_by_name (const char *name) {
return gras_msgtype_by_namev(name,0);
}
-/** @brief retrive an existing message type from its name and version. */
+/** @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;
return res;
}
-/** @brief retrive an existing message type from its name and version. */
+/** @brief retrieve 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);
}
msgt_want, NULL, NULL, NULL,
&msg);
+ if (msgt_want->ctn_type) {
+ xbt_assert1(payload,
+ "Message type '%s' convey a payload you must accept",
+ msgt_want->name);
+ } else {
+ xbt_assert1(!payload,
+ "No payload was declared for message type '%s'",
+ msgt_want->name);
+ }
+
if (payload) {
memcpy(payload,msg.payl,msg.payl_size);
free(msg.payl);
gras_msgtype_t msgtype,
void *payload) {
+ if (msgtype->ctn_type) {
+ xbt_assert1(payload,
+ "Message type '%s' convey a payload you must provide",
+ msgtype->name);
+ } else {
+ xbt_assert1(!payload,
+ "No payload was declared for message type '%s'",
+ msgtype->name);
+ }
+
gras_msg_send_ext(sock, e_gras_msg_kind_oneway,0, msgtype, payload);
}
+/** @brief Handle all messages arriving within the given period
+ *
+ * @param timeOut: How long to wait for incoming messages (in seconds)
+ * @return the error code (or no_error).
+ *
+ * Messages are dealed with just like gras_msg_handle() would do. The
+ * difference is that gras_msg_handle() handles at most one message (or wait up
+ * to timeout second when no message arrives) while this function handles any
+ * amount of messages, and lasts the given period in any case.
+ */
+void
+gras_msg_handleall(double period) {
+ xbt_ex_t e;
+ double begin=gras_os_time();
+ double now;
+
+ do {
+ now=gras_os_time();
+ TRY{
+ gras_msg_handle(period - now + begin);
+ } CATCH(e) {
+ if (e.category != timeout_error)
+ RETHROW0("Error while waiting for messages: %s");
+ xbt_ex_free(e);
+ }
+ } 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)
* @return the error code (or no_error).
*
- * Messages are passed to the callbacks.
+ * Messages are passed to the callbacks. See also gras_msg_handleall().
*/
void
gras_msg_handle(double timeOut) {
e_gras_msg_kind_names[msg.kind]);
} CATCH(e) {
- RETHROW1("Error caught while receiving a message on select()ed socket %p: %s",
- msg.expe);
+ RETHROW4("Error while receiving a message on select()ed socket %p to [%s]%s:%d: %s",
+ msg.expe,
+ gras_socket_peer_proc(msg.expe),gras_socket_peer_name(msg.expe),
+ gras_socket_peer_port(msg.expe));
}
}
}
}
}
if (!list) {
- INFO1("No callback for the incomming '%s' message. Discarded.",
- msg.type->name);
+ INFO3("No callback for the incomming '%s' message (from %s:%d). Discarded.",
+ msg.type->name,
+ gras_socket_peer_name(msg.expe),gras_socket_peer_port(msg.expe));
WARN0("FIXME: gras_datadesc_free not implemented => leaking the payload");
return;
}