#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 */
#define MIN(a,b) ((a) < (b) ? (a) : (b))
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg,gras,"High level messaging");
xbt_set_t _gras_msgtype_set = NULL;
-static char GRAS_header[6];
static char *make_namev(const char *name, short int ver);
+char _GRAS_header[6];
/*
* 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);
/*
* Module registration
*/
+int gras_msg_libdata_id;
void gras_msg_register() {
- gras_procdata_add("gras_msg",gras_msg_procdata_new, gras_msg_procdata_free);
+ gras_msg_libdata_id = gras_procdata_add("gras_msg",gras_msg_procdata_new, gras_msg_procdata_free);
}
/*
_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;
}
/*
short int version,
gras_datadesc_type_t payload) {
- gras_msgtype_t msgtype;
+ gras_msgtype_t msgtype=NULL;
char *namev=make_namev(name,version);
- int found = 0;
+ volatile int found = 0;
xbt_ex_t e;
TRY {
msgtype = (gras_msgtype_t)xbt_set_get_by_name(_gras_msgtype_set,namev);
found = 1;
} CATCH(e) {
- if (e.category != mismatch_error)
+ if (e.category != not_found_error)
RETHROW;
xbt_ex_free(e);
}
return res;
}
-
-/** \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) {
-
- static gras_datadesc_type_t string_type=NULL;
-
- if (!msgtype)
- THROW0(mismatch_error,0,
- "Cannot send the NULL message (did msgtype_by_name fail?)");
-
- if (!string_type) {
- string_type = gras_datadesc_by_name("string");
- xbt_assert(string_type);
- }
-
- DEBUG3("send '%s' to %s:%d", msgtype->name,
- gras_socket_peer_name(sock),gras_socket_peer_port(sock));
- gras_trp_chunk_send(sock, GRAS_header, 6);
-
- gras_datadesc_send(sock, string_type, &msgtype->name);
- if (msgtype->ctn_type)
- gras_datadesc_send(sock, msgtype->ctn_type, payload);
- gras_trp_flush(sock);
-}
-/*
- * receive the next message on the given socket.
- */
-void
-gras_msg_recv(gras_socket_t sock,
- gras_msgtype_t *msgtype,
- void **payload,
- int *payload_size) {
-
- xbt_ex_t e;
- static gras_datadesc_type_t string_type=NULL;
- char header[6];
- int cpt;
- 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);
- } CATCH(e) {
- THROW2(e.category,e.value,
- "Exception caught while trying to get the mesage header on socket %p : %s",
- sock,e.msg);
- }
-
- for (cpt=0; cpt<4; cpt++)
- if (header[cpt] != GRAS_header[cpt])
- THROW2(mismatch_error,0,
- "Incoming bytes do not look like a GRAS message (header='%.4s' not '%.4s')",header,GRAS_header);
- if (header[4] != GRAS_header[4])
- THROW2(mismatch_error,0,"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));
-
- gras_datadesc_recv(sock, string_type, r_arch, &msg_name);
- TRY {
- *msgtype = (gras_msgtype_t)xbt_set_get_by_name(_gras_msgtype_set,msg_name);
- } CATCH(e) {
- /* FIXME: Survive unknown messages */
- RETHROW1("Exception caught while retrieving the type associated to messages '%s' : %s",
- msg_name);
- }
- free(msg_name);
-
- 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);
- gras_datadesc_recv(sock, (*msgtype)->ctn_type, r_arch, *payload);
- } else {
- *payload = NULL;
- *payload_size = 0;
- }
+/** @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);
}
/** \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).
+ * @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 gras_msg_handle().
*/
+
void
-gras_msg_wait(double timeout,
- gras_msgtype_t msgt_want,
- gras_socket_t *expeditor,
- void *payload) {
+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) {
- gras_msgtype_t msgt_got;
- void *payload_got;
- int payload_size_got;
+ s_gras_msg_t msg;
double start, now;
- gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
+ gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id);
int cpt;
- s_gras_msg_t msg;
- gras_socket_t expeditor_res = NULL;
-
- payload_got = NULL;
xbt_assert0(msgt_want,"Cannot wait for the NULL message");
start = now = gras_os_time();
xbt_dynar_foreach(pd->msg_queue,cpt,msg){
- if (msg.type->code == msgt_want->code) {
- if (expeditor)
- *expeditor = msg.expeditor;
- memcpy(payload, msg.payload, msg.payload_size);
- free(msg.payload);
+ 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;
}
while (1) {
- expeditor_res = gras_trp_select(timeout - now + start);
- 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");
+ 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_res;
- msg.type = msgt_got;
- msg.payload = payload;
- msg.payload_size = payload_size_got;
xbt_dynar_push(pd->msg_queue,&msg);
now=gras_os_time();
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);
+}
+
+
+/** \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)
*
int cpt;
s_gras_msg_t msg;
- gras_socket_t expeditor;
+ gras_socket_t expeditor=NULL;
void *payload=NULL;
- int payload_size;
- gras_msgtype_t msgtype;
+ gras_msgtype_t msgtype=NULL;
- gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
+ 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;
if (xbt_dynar_length(pd->msg_queue)) {
DEBUG0("Get a message from the queue");
xbt_dynar_shift(pd->msg_queue,&msg);
- expeditor = msg.expeditor;
+ expeditor = msg.expe;
msgtype = msg.type;
- payload = msg.payload;
+ payload = msg.payl;
} else {
TRY {
expeditor = gras_trp_select(timeOut);
if (!timeouted) {
TRY {
- gras_msg_recv(expeditor, &msgtype, &payload, &payload_size);
+ /* 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",
+ RETHROW1("Error caught while receiving a message on select()ed socket %p: %s",
expeditor);
}
}
}
}
+ /* FIXME: gras_datadesc_free not implemented => leaking the payload */
THROW1(mismatch_error,0,
"Message '%s' refused by all registered callbacks", msgtype->name);
}
void
gras_cb_register(gras_msgtype_t msgtype,
gras_msg_cb_t cb) {
- gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
+ gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id);
gras_cblist_t *list=NULL;
int cpt;
gras_cb_unregister(gras_msgtype_t msgtype,
gras_msg_cb_t cb) {
- gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_get("gras_msg");
+ gras_msg_procdata_t pd=(gras_msg_procdata_t)gras_libdata_by_id(gras_msg_libdata_id);
gras_cblist_t *list;
gras_msg_cb_t cb_cpt;
int cpt;