X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a9f96113bc9372624cefc06d484a8943bea9992..94974c282c6e6d096238716853bb053330170d76:/src/gras/Msg/sg_msg.c diff --git a/src/gras/Msg/sg_msg.c b/src/gras/Msg/sg_msg.c index 4e32910f68..0af9f97c86 100644 --- a/src/gras/Msg/sg_msg.c +++ b/src/gras/Msg/sg_msg.c @@ -20,7 +20,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_msg); typedef void *gras_trp_bufdata_; #include "simix/datatypes.h" -#include "simix/private.h" /* Yeah, the following is awfull, breaking the encapsulation of at least 3 modules * at the same time, but I'm tracking this bug since too long now, I want it dead. now. @@ -41,11 +40,17 @@ int gras_socket_im_the_server(gras_socket_t sock) { smx_process_t server_listener_process=NULL; smx_process_t client_listener_process = NULL; + XBT_VERB("Am I the server of socket %p (client = %p, server = %p) ? process self: %p", sock, sock_data->client, sock_data->server, SIMIX_process_self()); - if (sock_data->server == SIMIX_process_self()) + if (sock_data->server == SIMIX_process_self()) { + XBT_VERB("I am the server"); return 1; - if (sock_data->client == SIMIX_process_self()) + } + if (sock_data->client == SIMIX_process_self()) { + XBT_VERB("I am the client"); return 0; + } + XBT_VERB("I am neither the client nor the server, probably a listener"); /* neither the client nor the server. Check their respective listeners */ pd = ((gras_procdata_t*)SIMIX_process_get_data(sock_data->server)); @@ -53,8 +58,10 @@ int gras_socket_im_the_server(gras_socket_t sock) { if (l) { listener_thread = ((fake_gras_msg_listener_t)l)->listener; server_listener_process = ((fake_xbt_thread_t)listener_thread)->s_process; - if (server_listener_process == SIMIX_process_self()) + if (server_listener_process == SIMIX_process_self()) { + XBT_VERB("I am the listener of the server"); return 1; + } } if (sock_data->client) { @@ -63,20 +70,22 @@ int gras_socket_im_the_server(gras_socket_t sock) { if (l) { listener_thread = ((fake_gras_msg_listener_t)l)->listener; client_listener_process = ((fake_xbt_thread_t)listener_thread)->s_process; - if (client_listener_process == SIMIX_process_self()) + if (client_listener_process == SIMIX_process_self()) { + XBT_VERB("I am the listener of the client"); return 0; + } } } /* THAT'S BAD! I should be either client or server of the sockets I get messages on!! */ /* This is where the bug is visible. Try to die as loudly as possible */ xbt_backtrace_display_current(); ((char*)sock)[sizeof(*sock)+1] = '0'; /* Try to make valgrind angry to see where that damn socket comes from */ - system(bprintf("cat /proc/%d/maps 1>&2",getpid())); - INFO6("I'm not the client in socket %p (comm:%p, rdvser=%p, rdvcli=%p) to %s, that's %s", + if(system(bprintf("cat /proc/%d/maps 1>&2",getpid()))){} + XBT_INFO("I'm not the client in socket %p (comm:%p, rdvser=%p, rdvcli=%p) to %s, that's %s", sock,sock_data->comm_recv,sock_data->rdv_server,sock_data->rdv_client, SIMIX_host_get_name(SIMIX_process_get_host(sock_data->server)), sock_data->client?SIMIX_host_get_name(SIMIX_process_get_host(sock_data->client)):"(no client)"); - INFO7("server:%s (%p) server_listener=%p client:%s (%p) client_listener=%p, I'm %p", + XBT_INFO("server:%s (%p) server_listener=%p client:%s (%p) client_listener=%p, I'm %p", SIMIX_host_get_name(SIMIX_process_get_host(sock_data->server)), sock_data->server,server_listener_process, sock_data->client?SIMIX_host_get_name(SIMIX_process_get_host(sock_data->client)):"(no client)", sock_data->client,client_listener_process, SIMIX_process_self()); @@ -90,17 +99,16 @@ gras_msg_t gras_msg_recv_any(void) (gras_trp_procdata_t) gras_libdata_by_name("gras_trp"); gras_msg_t msg; /* Build a dynar of all communications I could get something from */ - xbt_dynar_t comms = xbt_dynar_new(sizeof(smx_comm_t), NULL); + xbt_dynar_t comms = xbt_dynar_new(sizeof(smx_action_t), NULL); unsigned int cursor = 0; int got = 0; - smx_comm_t comm = NULL; gras_socket_t sock = NULL; gras_trp_sg_sock_data_t sock_data; xbt_dynar_foreach(trp_proc->sockets, cursor, sock) { sock_data = (gras_trp_sg_sock_data_t) sock->data; - DEBUG5 + XBT_DEBUG ("Consider socket %p (data:%p; Here rdv: %p; Remote rdv: %p; Comm %p) to get a message", sock, sock_data, gras_socket_im_the_server(sock)? @@ -137,31 +145,29 @@ gras_msg_t gras_msg_recv_any(void) * an iterator, incremented only when the socket has a comm. And we've the right socket * when that iterator is equal to "got", the result of waitany. Not needed if B holds. */ - xbt_assert1(sock_data->comm_recv, + xbt_assert(sock_data->comm_recv, "Comm_recv of socket %p is empty; please report that nasty bug", sock); /* End of paranoia */ - VERB4("Consider receiving messages from on comm_recv %p (%s) rdv:%p (other rdv:%p)", - sock_data->comm_recv, sock_data->comm_recv->type == comm_send? "send":"recv", + XBT_VERB("Consider receiving messages from on comm_recv %p rdv:%p (other rdv:%p)", + sock_data->comm_recv, gras_socket_im_the_server(sock)? sock_data->rdv_server : sock_data->rdv_client, gras_socket_im_the_server(sock)? sock_data->rdv_client : sock_data->rdv_server); xbt_dynar_push(comms, &(sock_data->comm_recv)); } - VERB1("Wait on %ld 'sockets'", xbt_dynar_length(comms)); + XBT_VERB("Wait on %ld 'sockets'", xbt_dynar_length(comms)); /* Wait for the end of any of these communications */ - got = SIMIX_network_waitany(comms); + got = SIMIX_req_comm_waitany(comms); /* retrieve the message sent in that communication */ - xbt_dynar_get_cpy(comms, got, &(comm)); - msg = SIMIX_communication_get_data(comm); sock = xbt_dynar_get_as(trp_proc->sockets, got, gras_socket_t); sock_data = (gras_trp_sg_sock_data_t) sock->data; - VERB3("Got something. Communication %p's over rdv_server=%p, rdv_client=%p", - comm,sock_data->rdv_server,sock_data->rdv_client); - SIMIX_communication_destroy(comm); + msg = sock_data->msg; + XBT_VERB("Got something. Communication over rdv_server=%p, rdv_client=%p", + sock_data->rdv_server,sock_data->rdv_client); /* Reinstall a waiting communication on that rdv */ /* xbt_dynar_foreach(trp_proc->sockets,cursor,sock) { @@ -171,9 +177,9 @@ gras_msg_t gras_msg_recv_any(void) } */ sock_data->comm_recv = - SIMIX_network_irecv(gras_socket_im_the_server(sock) ? + SIMIX_req_comm_irecv(gras_socket_im_the_server(sock) ? sock_data->rdv_server : sock_data->rdv_client, - NULL, 0); + &sock_data->msg, NULL, NULL, NULL); return msg; } @@ -187,7 +193,7 @@ void gras_msg_send_ext(gras_socket_t sock, 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 */ gras_msg_t msg; /* message to send */ - smx_comm_t comm; + smx_action_t comm; gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data; smx_rdv_t target_rdv = @@ -203,7 +209,7 @@ void gras_msg_send_ext(gras_socket_t sock, msg->type = msgtype; msg->ID = ID; - VERB4("Send msg %s (%s) to rdv %p sock %p", + XBT_VERB("Send msg %s (%s) to rdv %p sock %p", msgtype->name, e_gras_msg_kind_names[kind], target_rdv, sock); if (kind == e_gras_msg_kind_rpcerror) { @@ -231,9 +237,9 @@ void gras_msg_send_ext(gras_socket_t sock, payload, msg->payl); } - SIMIX_network_send(target_rdv, whole_payload_size, -1, -1, &msg, - sizeof(void *), &comm, msg); + comm = SIMIX_req_comm_isend(target_rdv, whole_payload_size, -1, msg, sizeof(void *), NULL,NULL, msg, 0); + SIMIX_req_comm_wait(comm, -1); - VERB0("Message sent (and received)"); + XBT_VERB("Message sent (and received)"); }