X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a18de5d84898a36d9bbdadf2683990da025a60e4..ae66e43b95b26467c1cb9df271e83f51d3d7147b:/src/gras/Msg/sg_msg.c diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c index 67b2d8b32b..afd8d342e3 100644 --- a/src/gras/Msg/sg_msg.c +++ b/src/gras/Msg/sg_msg.c @@ -20,26 +20,40 @@ XBT_LOG_EXTERNAL_CATEGORY(gras_msg); XBT_LOG_DEFAULT_CATEGORY(gras_msg); +typedef void* gras_trp_bufdata_; + void gras_msg_send_ext(gras_socket_t sock, e_gras_msg_kind_t kind, unsigned long int ID, gras_msgtype_t msgtype, void *payload) { - m_task_t task=NULL; - gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)sock->data; - gras_msg_t msg; + 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 */ - char *name; + + 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=xbt_new0(s_gras_msg_t,1); - msg->type=msgtype; - msg->ID = ID; - + + /* got the mutex my port */ + DEBUG1("Sock port %d",sock->port); + SIMIX_mutex_lock(sock_data->mutex); + + /*initialize gras message */ + msg = xbt_new(s_gras_msg_t,1); + msg->expe = sock; + msg->kind = kind; + msg->type = msgtype; + msg->ID = ID; if (kind == e_gras_msg_kind_rpcerror) { /* error on remote host, carfull, payload is an exception */ msg->payl_size=gras_datadesc_size(gras_datadesc_by_name("ex_t")); @@ -59,33 +73,37 @@ void gras_msg_send_ext(gras_socket_t sock, whole_payload_size = gras_datadesc_copy(msgtype->ctn_type, payload, msg->payl); } + /* 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); + + /* wake-up the receiver */ + trp_remote_proc = (gras_trp_procdata_t)gras_libdata_by_name_from_remote("gras_trp",sock_data->to_process); + xbt_fifo_push(trp_remote_proc->active_socket,sock); - msg->kind = kind; + SIMIX_cond_signal(trp_remote_proc->cond); - if (XBT_LOG_ISENABLED(gras_msg,xbt_log_priority_verbose)) { - asprintf(&name,"type:'%s';kind:'%s';ID %lu from %s:%d to %s:%d", - msg->type->name, e_gras_msg_kind_names[msg->kind], msg->ID, - gras_os_myname(),gras_os_myport(), - gras_socket_peer_name(sock), gras_socket_peer_port(sock)); - task=MSG_task_create(name,0, - ((double)whole_payload_size),msg); - free(name); - } else { - task=MSG_task_create(msg->type->name,0, - ((double)whole_payload_size),msg); - } - + /* wait for the receiver */ + SIMIX_cond_wait(sock_data->cond, sock_data->mutex); - DEBUG1("Prepare to send a message to %s", - MSG_host_get_name (sock_data->to_host)); - if (MSG_task_put_with_timeout(task, sock_data->to_host,sock_data->to_chan,60.0) != MSG_OK) - THROW0(system_error,0,"Problem during the MSG_task_put with timeout 60"); + /* 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); + SIMIX_register_condition_to_action(act,sock_data->cond); + + VERB5("Sending to %s(%s) a message type '%s' kind '%s' ID %lu", + 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_cond_wait(sock_data->cond, sock_data->mutex); + /* error treatmeant */ + + /* cleanup structures */ + SIMIX_action_destroy(act); + SIMIX_mutex_unlock(sock_data->mutex); + + VERB0("Message sent"); - VERB5("Sent to %s(%d) a message type '%s' kind '%s' ID %lu", - MSG_host_get_name(sock_data->to_host),sock_data->to_PID, - msg->type->name, - e_gras_msg_kind_names[msg->kind], - msg->ID); } /* * receive the next message on the given socket. @@ -94,30 +112,41 @@ void gras_msg_recv(gras_socket_t sock, gras_msg_t msg) { - m_task_t task=NULL; + 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_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_by_name("gras_trp"); + 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", sock); xbt_assert0(msg,"msg is an out parameter of gras_msg_recv..."); + sock_data = (gras_trp_sg_sock_data_t *)sock->data; + 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 (MSG_task_get(&task, pd->chan) != MSG_OK) - THROW0(system_error,0,"Error in MSG_task_get()"); + if (xbt_fifo_size(msg_procdata->msg_to_receive_queue) == 0 ) { + THROW_IMPOSSIBLE; + } + DEBUG1("Size msg_to_receive buffer: %d", xbt_fifo_size(msg_procdata->msg_to_receive_queue)); + msg_got = xbt_fifo_shift(msg_procdata->msg_to_receive_queue); - msg_got=MSG_task_get_data(task); + SIMIX_mutex_lock(remote_sock_data->mutex); +/* ok, I'm here, you can continuate the communication */ + SIMIX_cond_signal(remote_sock_data->cond); +/* wait for communication end */ + SIMIX_cond_wait(remote_sock_data->cond,remote_sock_data->mutex); - msg_got->expe= msg->expe; + 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); - free(msg_got); - if (MSG_task_destroy(task) != MSG_OK) - THROW0(system_error,0,"Error in MSG_task_destroy()"); - - VERB3("Received a message type '%s' kind '%s' ID %lu",// from %s", + VERB3("Received a message type '%s' kind '%s' ID %lu",// from %s", msg->type->name, e_gras_msg_kind_names[msg->kind], msg->ID);