-/* $Id$ */
-
/* messaging - Function related to messaging code specific to SG */
-/* Copyright (c) 2003-2005 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
unsigned long int ID,
gras_msgtype_t msgtype, void *payload)
{
+
+ smx_action_t act; /* simix action */
gras_trp_sg_sock_data_t *sock_data;
+ gras_hostdata_t *hd;
+ gras_trp_procdata_t trp_remote_proc;
+ gras_msg_procdata_t msg_remote_proc;
gras_msg_t msg; /* message to send */
int whole_payload_size = 0; /* msg->payload_size is used to memcpy the payload.
This is used to report the load onto the simulator. It also counts the size of pointed stuff */
sock_data = (gras_trp_sg_sock_data_t *) sock->data;
+ hd = (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self());
+
xbt_assert1(!gras_socket_is_meas(sock),
"Asked to send a message on the measurement socket %p", sock);
msg->type = msgtype;
msg->ID = ID;
if (kind == e_gras_msg_kind_rpcerror) {
- /* error on remote host, careful, payload is an exception */
+ /* error on remote host, carfull, payload is an exception */
msg->payl_size = gras_datadesc_size(gras_datadesc_by_name("ex_t"));
msg->payl = xbt_malloc(msg->payl_size);
whole_payload_size = gras_datadesc_memcpy(gras_datadesc_by_name("ex_t"),
payload, msg->payl);
}
+ /* put the selectable socket on the queue */
+ trp_remote_proc = (gras_trp_procdata_t)
+ gras_libdata_by_name_from_remote("gras_trp", sock_data->to_process);
+
+ xbt_queue_push(trp_remote_proc->msg_selectable_sockets, &sock);
+
+ /* put message on msg_queue */
+ msg_remote_proc = (gras_msg_procdata_t)
+ gras_libdata_by_name_from_remote("gras_msg", sock_data->to_process);
+ xbt_fifo_push(msg_remote_proc->msg_to_receive_queue, msg);
+ /* wait for the receiver */
+ SIMIX_cond_wait(sock_data->cond, sock_data->mutex);
+
+ /* creates simix action and waits its ends, waits in the sender host
+ condition */
+ act = SIMIX_action_communicate(SIMIX_host_self(),
+ sock_data->to_host, msgtype->name,
+ (double) whole_payload_size, -1);
+ SIMIX_register_action_to_condition(act, sock_data->cond);
VERB5("Sending to %s(%s) a message type '%s' kind '%s' ID %lu",
- sock->peer_name,sock->peer_proc,
+ SIMIX_host_get_name(sock_data->to_host),
+ SIMIX_process_get_name(sock_data->to_process),
msg->type->name, e_gras_msg_kind_names[msg->kind], msg->ID);
- SIMIX_network_send(sock_data->rdv,whole_payload_size,-1.,-1.,msg,sizeof(s_gras_msg_t),(smx_comm_t*)&(msg->comm),&msg);
+
+ SIMIX_cond_wait(sock_data->cond, sock_data->mutex);
+ SIMIX_unregister_action_to_condition(act, sock_data->cond);
+ /* error treatmeant (FIXME) */
+
+ /* cleanup structures */
+ SIMIX_action_destroy(act);
+ SIMIX_mutex_unlock(sock_data->mutex);
VERB0("Message sent");
+
}
/*
* receive the next message on the given socket.
*/
-void gras_msg_recv(gras_socket_t sock, gras_msg_t msg) {
- gras_trp_procdata_t pd =
- (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
+void gras_msg_recv(gras_socket_t sock, gras_msg_t msg)
+{
+
gras_trp_sg_sock_data_t *sock_data;
+ gras_trp_sg_sock_data_t *remote_sock_data;
+ gras_hostdata_t *remote_hd;
+ gras_msg_t msg_got;
+ gras_msg_procdata_t msg_procdata =
+ (gras_msg_procdata_t) gras_libdata_by_name("gras_msg");
xbt_assert1(!gras_socket_is_meas(sock),
"Asked to receive a message on the measurement socket %p",
xbt_assert0(msg, "msg is an out parameter of gras_msg_recv...");
sock_data = (gras_trp_sg_sock_data_t *) sock->data;
-
- /* The message was already received while emulating the select, so simply copy it here */
- memcpy(msg,&(sock_data->ongoing_msg),sizeof(s_gras_msg_t));
- msg->expe = sock;
- VERB1("Using %p as a msg",&(sock_data->ongoing_msg));
- VERB5("Received a message type '%s' kind '%s' ID %lu from %s(%s)",
- msg->type->name, e_gras_msg_kind_names[msg->kind], msg->ID,
- sock->peer_name,sock->peer_proc);
-
- /* Recreate another comm object to replace the one which just terminated */
- int rank = xbt_dynar_search(pd->sockets,&sock);
- xbt_assert0(rank>=0,"Socket not found in my array");
- sock_data->ongoing_msg_size = sizeof(s_gras_msg_t);
- smx_comm_t comm = SIMIX_network_irecv(sock_data->rdv,&(sock_data->ongoing_msg),&(sock_data->ongoing_msg_size));
- xbt_dynar_set(pd->comms,rank,&comm);
-
-#if 0 /* KILLME */
- SIMIX_network_recv(sock_data->rdv,-1.,&msg_got,NULL,&comm);
-
-
remote_sock_data =
((gras_trp_sg_sock_data_t *) sock->data)->to_socket->data;
+ DEBUG3("Remote host %s, Remote Port: %d Local port %d",
+ SIMIX_host_get_name(sock_data->to_host), sock->peer_port,
+ sock->port);
remote_hd = (gras_hostdata_t *) SIMIX_host_get_data(sock_data->to_host);
if (xbt_fifo_size(msg_procdata->msg_to_receive_queue) == 0) {
SIMIX_cond_signal(remote_sock_data->cond);
/* wait for communication end */
- INFO2("Wait communication (from %s) termination on %p",sock->peer_name,sock_data->cond);
-
SIMIX_cond_wait(remote_sock_data->cond, remote_sock_data->mutex);
msg_got->expe = msg->expe;
memcpy(msg, msg_got, sizeof(s_gras_msg_t));
xbt_free(msg_got);
SIMIX_mutex_unlock(remote_sock_data->mutex);
-#endif
+
+ VERB3("Received a message type '%s' kind '%s' ID %lu", // from %s",
+ msg->type->name, e_gras_msg_kind_names[msg->kind], msg->ID);
}
