X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51403eb04bbb5daaf00fac47f9298fe551b703d8..f9dd9e3d692f6c43f78500a9fc66fe8663dedbbf:/src/gras/Transport/transport_plugin_sg.c diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c index 5f419a55a9..277aea06e6 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -16,6 +16,7 @@ #include "gras/Msg/msg_private.h" #include "gras/Transport/transport_private.h" #include "gras/Virtu/virtu_sg.h" +#include "xbt/xbt_socket_private.h" /* FIXME */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp, "SimGrid pseudo-transport"); @@ -27,22 +28,22 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp, /* retrieve the port record associated to a numerical port on an host */ static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port); -void gras_trp_sg_socket_client(gras_trp_plugin_t self, +void gras_trp_sg_socket_client(xbt_trp_plugin_t self, const char*host, int port, - /* OUT */ gras_socket_t sock); -void gras_trp_sg_socket_server(gras_trp_plugin_t self, + /* OUT */ xbt_socket_t sock); +void gras_trp_sg_socket_server(xbt_trp_plugin_t self, int port, - /* OUT */ gras_socket_t sock); -void gras_trp_sg_socket_close(gras_socket_t sd); + /* OUT */ xbt_socket_t sock); +void gras_trp_sg_socket_close(xbt_socket_t sd); -void gras_trp_sg_chunk_send_raw(gras_socket_t sd, +void gras_trp_sg_chunk_send_raw(xbt_socket_t sd, const char *data, unsigned long int size); -void gras_trp_sg_chunk_send(gras_socket_t sd, +void gras_trp_sg_chunk_send(xbt_socket_t sd, const char *data, unsigned long int size, int stable_ignored); -int gras_trp_sg_chunk_recv(gras_socket_t sd, +int gras_trp_sg_chunk_recv(xbt_socket_t sd, char *data, unsigned long int size); /*** @@ -61,7 +62,7 @@ static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port) unsigned int cpt; gras_sg_portrec_t pr; - xbt_assert0(hd, "Please run gras_process_init on each process"); + xbt_assert(hd, "Please run gras_process_init on each process"); xbt_dynar_foreach(hd->ports, cpt, pr) { if (pr->port == port) @@ -73,38 +74,41 @@ static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port) /*** *** Info about who's speaking ***/ -static int gras_trp_sg_my_port(gras_socket_t s) { - gras_trp_sg_sock_data_t sockdata = s->data; +static int gras_trp_sg_my_port(xbt_socket_t s) +{ + gras_trp_sg_sock_data_t sockdata = xbt_socket_get_data(s); if (gras_socket_im_the_server(s)) return sockdata->server_port; else return sockdata->client_port; } -static int gras_trp_sg_peer_port(gras_socket_t s) { - gras_trp_sg_sock_data_t sockdata = s->data; +static int gras_trp_sg_peer_port(xbt_socket_t s) +{ + gras_trp_sg_sock_data_t sockdata = xbt_socket_get_data(s); if (gras_socket_im_the_server(s)) return sockdata->client_port; else return sockdata->server_port; } -static const char* gras_trp_sg_peer_name(gras_socket_t s) { - gras_trp_sg_sock_data_t sockdata = s->data; + +static const char* gras_trp_sg_peer_name(xbt_socket_t s) +{ + gras_trp_sg_sock_data_t sockdata = xbt_socket_get_data(s); if (gras_socket_im_the_server(s)) - return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->client)); + return SIMIX_host_get_name(simcall_process_get_host(sockdata->client)); else { - return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->server)); + return SIMIX_host_get_name(simcall_process_get_host(sockdata->server)); } } -static const char* gras_trp_sg_peer_proc(gras_socket_t s) { +static const char* gras_trp_sg_peer_proc(xbt_socket_t s) { THROW_UNIMPLEMENTED; } -static void gras_trp_sg_peer_proc_set(gras_socket_t s,char *name) { +static void gras_trp_sg_peer_proc_set(xbt_socket_t s,char *name) { THROW_UNIMPLEMENTED; } -void gras_trp_sg_setup(gras_trp_plugin_t plug) +void gras_trp_sg_setup(xbt_trp_plugin_t plug) { - plug->my_port = gras_trp_sg_my_port; plug->peer_port = gras_trp_sg_peer_port; plug->peer_name = gras_trp_sg_peer_name; @@ -126,10 +130,10 @@ void gras_trp_sg_setup(gras_trp_plugin_t plug) plug->flush = NULL; /* nothing cached */ } -void gras_trp_sg_socket_client(gras_trp_plugin_t self, +void gras_trp_sg_socket_client(xbt_trp_plugin_t self, const char*host, int port, - /* OUT */ gras_socket_t sock) + /* OUT */ xbt_socket_t sock) { smx_host_t peer; @@ -138,32 +142,32 @@ void gras_trp_sg_socket_client(gras_trp_plugin_t self, gras_sg_portrec_t pr; /* make sure this socket will reach someone */ - if (!(peer = SIMIX_host_get_by_name(host))) - THROW1(mismatch_error, 0, + if (!(peer = simcall_host_get_by_name(host))) + THROWF(mismatch_error, 0, "Can't connect to %s: no such host.\n", host); - if (!(hd = (gras_hostdata_t *) SIMIX_host_get_data(peer))) - THROW1(mismatch_error, 0, + if (!(hd = (gras_hostdata_t *) simcall_host_get_data(peer))) + THROWF(mismatch_error, 0, "can't connect to %s: no process on this host", host); pr = find_port(hd, port); if (pr == NULL) { - THROW2(mismatch_error, 0, + THROWF(mismatch_error, 0, "can't connect to %s:%d, no process listen on this port", host, port); } /* Ensure that the listener is expecting the kind of stuff we want to send */ if (pr->meas && !sock->meas) { - THROW2(mismatch_error, 0, + THROWF(mismatch_error, 0, "can't connect to %s:%d in regular mode, the process listen " "in measurement mode on this port", host, port); } if (!pr->meas && sock->meas) { - THROW2(mismatch_error, 0, + THROWF(mismatch_error, 0, "can't connect to %s:%d in measurement mode, the process listen " "in regular mode on this port", host, port); @@ -178,28 +182,28 @@ void gras_trp_sg_socket_client(gras_trp_plugin_t self, /* initialize synchronization stuff on the socket */ data->rdv_server = pr->rdv; - data->rdv_client = SIMIX_rdv_create(NULL); - data->comm_recv = SIMIX_network_irecv(data->rdv_client, NULL, 0); + data->rdv_client = simcall_rdv_create(NULL); + data->comm_recv = simcall_comm_irecv(data->rdv_client, &data->msg, NULL, NULL, NULL); /* connect that simulation data to the socket */ sock->data = data; sock->incoming = 1; - 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(), + XBT_DEBUG("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)", + simcall_process_get_name(SIMIX_process_self()), gras_os_getpid(), 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) +void gras_trp_sg_socket_server(xbt_trp_plugin_t self, int port, xbt_socket_t sock) { gras_hostdata_t *hd = - (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self()); + (gras_hostdata_t *) SIMIX_host_self_get_data(); gras_sg_portrec_t pr; gras_trp_sg_sock_data_t data; - xbt_assert0(hd, "Please run gras_process_init on each process"); + xbt_assert(hd, "Please run gras_process_init on each process"); sock->accepting = 1; @@ -207,17 +211,17 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s pr = find_port(hd, port); if (pr) - THROW2(mismatch_error, 0, + THROWF(mismatch_error, 0, "can't listen on address %s:%d: port already in use.", - SIMIX_host_get_name(SIMIX_host_self()), port); + SIMIX_host_self_get_name(), port); /* This port is free, let's take it */ pr = xbt_new(s_gras_sg_portrec_t, 1); pr->port = port; pr->meas = sock->meas; pr->server = SIMIX_process_self(); - pr->rdv = SIMIX_rdv_create(NULL); xbt_dynar_push(hd->ports, &pr); + pr->rdv = simcall_rdv_create(NULL); /* Create the socket */ data = xbt_new0(s_gras_trp_sg_sock_data_t, 1); @@ -226,14 +230,14 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s data->client = NULL; data->rdv_server = pr->rdv; data->rdv_client = NULL; - data->comm_recv = SIMIX_network_irecv(pr->rdv, NULL, 0); + data->comm_recv = simcall_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL); sock->data = data; - VERB10 + XBT_VERB ("'%s' (%d) ears on %s:%d%s (%p; data:%p); Here rdv: %p; Remote rdv: %p; Comm %p", - SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(), - SIMIX_host_get_name(SIMIX_host_self()), port, + simcall_process_get_name(SIMIX_process_self()), gras_os_getpid(), + SIMIX_host_self_get_name(), port, sock->meas ? " (mode meas)" : "", sock, data, (data->server == SIMIX_process_self())? data->rdv_server : data->rdv_client, @@ -243,41 +247,39 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s } -void gras_trp_sg_socket_close(gras_socket_t sock) +void gras_trp_sg_socket_close(xbt_socket_t sock) { gras_hostdata_t *hd = - (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self()); + (gras_hostdata_t *) SIMIX_host_self_get_data(); unsigned int cpt; gras_sg_portrec_t pr; - XBT_IN1(" (sock=%p)", sock); + XBT_IN(" (sock=%p)", sock); if (!sock) return; - xbt_assert0(hd, "Please run gras_process_init on each process"); + xbt_assert(hd, "Please run gras_process_init on each process"); gras_trp_sg_sock_data_t sockdata = sock->data; if (sock->incoming && !sock->outgoing && sockdata->server_port >= 0) { /* server mode socket. Unregister it from 'OS' tables */ xbt_dynar_foreach(hd->ports, cpt, pr) { - DEBUG2("Check pr %d of %lu", cpt, xbt_dynar_length(hd->ports)); + XBT_DEBUG("Check pr %d of %lu", cpt, xbt_dynar_length(hd->ports)); if (pr->port == sockdata->server_port) { xbt_dynar_cursor_rm(hd->ports, &cpt); - XBT_OUT; + XBT_OUT(); return; } } - WARN2 + XBT_WARN ("socket_close called on the unknown incoming socket %p (port=%d)", sock, sockdata->server_port); } - if (sock->data) { - /* FIXME: kill the rdv point if receiver side */ - free(sock->data); - } - XBT_OUT; + /* FIXME: kill the rdv point if receiver side */ + free(sock->data); + XBT_OUT(); } typedef struct { @@ -285,14 +287,14 @@ typedef struct { void *data; } sg_task_data_t; -void gras_trp_sg_chunk_send(gras_socket_t sock, +void gras_trp_sg_chunk_send(xbt_socket_t sock, const char *data, unsigned long int size, int stable_ignored) { gras_trp_sg_chunk_send_raw(sock, data, size); } -void gras_trp_sg_chunk_send_raw(gras_socket_t sock, +void gras_trp_sg_chunk_send_raw(xbt_socket_t sock, const char *data, unsigned long int size) { #ifdef KILLME @@ -305,7 +307,7 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock, gras_msg_t msg; /* message to send */ //gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data; - xbt_assert0(sock->meas, + xbt_assert(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets"); @@ -316,7 +318,7 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock, 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); + smx_host_t remote_host = simcall_process_get_host(remote_dude); } */ //SIMIX_network_send(sock_data->rdv,size,1,-1,NULL,0,NULL,NULL); @@ -324,30 +326,30 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock, THROW_UNIMPLEMENTED; } -int gras_trp_sg_chunk_recv(gras_socket_t sock, +int gras_trp_sg_chunk_recv(xbt_socket_t sock, char *data, unsigned long int size) { //gras_trp_sg_sock_data_t *sock_data = // (gras_trp_sg_sock_data_t *) sock->data; - //SIMIX_network_recv(sock_data->rdv,-1,NULL,0,NULL); + //simcall_comm_recv(sock_data->rdv,-1,NULL,0,NULL); THROW_UNIMPLEMENTED; #ifdef KILLME gras_trp_sg_sock_data_t *remote_sock_data; - gras_socket_t remote_socket = NULL; + xbt_socket_t remote_socket = NULL; gras_msg_t msg_got; gras_msg_procdata_t msg_procdata = (gras_msg_procdata_t) gras_libdata_by_name("gras_msg"); gras_trp_procdata_t trp_proc = (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id); - xbt_assert0(sock->meas, + xbt_assert(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets"); xbt_queue_shift_timed(trp_proc->meas_selectable_sockets, &remote_socket, 60); if (remote_socket == NULL) { - THROW0(timeout_error, 0, "Timeout"); + THROWF(timeout_error, 0, "Timeout"); } remote_sock_data = (gras_trp_sg_sock_data_t *) remote_socket->data; @@ -356,27 +358,26 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock, sock_data = (gras_trp_sg_sock_data_t *) sock->data; /* ok, I'm here, you can continue the communication */ - SIMIX_cond_signal(remote_sock_data->cond); + simcall_cond_signal(remote_sock_data->cond); - SIMIX_mutex_lock(remote_sock_data->mutex); + simcall_mutex_lock(remote_sock_data->mutex); /* wait for communication end */ - SIMIX_cond_wait(remote_sock_data->cond, remote_sock_data->mutex); + simcall_cond_wait(remote_sock_data->cond, remote_sock_data->mutex); if (msg_got->payl_size != size) - THROW5(mismatch_error, 0, + THROWF(mismatch_error, 0, "Got %d bytes when %ld where expected (in %s->%s:%d)", msg_got->payl_size, size, - SIMIX_host_get_name(sock_data->to_host), - SIMIX_host_get_name(SIMIX_host_self()), sock->peer_port); + simcall_host_get_name(sock_data->to_host), + SIMIX_host_self_get_name(), sock->peer_port); if (data) memcpy(data, msg_got->payl, size); - if (msg_got->payl) - xbt_free(msg_got->payl); + xbt_free(msg_got->payl); xbt_free(msg_got); - SIMIX_mutex_unlock(remote_sock_data->mutex); + simcall_mutex_unlock(remote_sock_data->mutex); #endif return 0; }