X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bcf8f219750d1298752869929343f32b780d2cc3..655afa10c8acf337cde1196c8a9505d2f91b3702:/src/gras/Transport/transport_plugin_sg.c?ds=sidebyside diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c index 911ae8b6a8..f83b704373 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -173,6 +173,7 @@ void gras_trp_sg_socket_client(gras_trp_plugin_t self, data->client = SIMIX_process_self(); data->server = pr->server; data->server_port = port; + data->client_port = gras_os_myport(); /* initialize synchronization stuff on the socket */ data->rdv_server = pr->rdv; @@ -183,10 +184,10 @@ void gras_trp_sg_socket_client(gras_trp_plugin_t self, sock->data = data; sock->incoming = 1; - DEBUG5("%s (PID %d) connects in %s mode to %s:%d", + DEBUG8("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)", SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(), - sock->meas ? "meas" : "regular", host, - port); + sock->meas ? "meas" : "regular", host, port, + data->rdv_server,data->rdv_client,data->comm_recv); } void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t sock) @@ -302,19 +303,21 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock, gras_msg_procdata_t msg_remote_proc; gras_msg_t msg; /* message to send */ - gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data; + //gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data; xbt_assert0(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets"); /* creates simix action and waits its ends, waits in the sender host condition */ + /* if (XBT_LOG_ISENABLED(gras_trp_sg, xbt_log_priority_debug)) { smx_process_t remote_dude = (sock_data->server == SIMIX_process_self())? (sock_data->client) : (sock_data->server); smx_host_t remote_host = SIMIX_process_get_host(remote_dude); } + */ //SIMIX_network_send(sock_data->rdv,size,1,-1,NULL,0,NULL,NULL); #endif THROW_UNIMPLEMENTED;