X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25d6952dcf52e6ffc1e4a402af0e2d3c17ac3935..063c63642a29000a011c0d6176d30eb62a4e0dca:/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 e777b589a7..a80c33118b 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -11,220 +11,187 @@ /* 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. */ -#include "xbt/ex.h" +#include "xbt/ex.h" -#include "msg/msg.h" - -#include "transport_private.h" +#include "gras/Msg/msg_private.h" +#include "gras/Transport/transport_private.h" #include "gras/Virtu/virtu_sg.h" -XBT_LOG_EXTERNAL_CATEGORY(transport); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_sg,transport,"SimGrid pseudo-transport"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp, + "SimGrid pseudo-transport"); /*** *** Prototypes ***/ -void hexa_print(unsigned char *data, int size); /* in gras.c */ - -/* retrieve the port record associated to a numerical port on an host */ -static void find_port(gras_hostdata_t *hd, int port, gras_sg_portrec_t *hpd); void gras_trp_sg_socket_client(gras_trp_plugin_t self, - /* OUT */ gras_socket_t sock); + /* OUT */ gras_socket_t sock); void gras_trp_sg_socket_server(gras_trp_plugin_t self, - /* OUT */ gras_socket_t sock); + /* OUT */ gras_socket_t sock); void gras_trp_sg_socket_close(gras_socket_t sd); +void gras_trp_sg_chunk_send_raw(gras_socket_t sd, + const char *data, unsigned long int size); void gras_trp_sg_chunk_send(gras_socket_t sd, - const char *data, - unsigned long int size); + const char *data, + unsigned long int size, int stable_ignored); -void gras_trp_sg_chunk_recv(gras_socket_t sd, - char *data, - unsigned long int size); +int gras_trp_sg_chunk_recv(gras_socket_t sd, + char *data, unsigned long int size); /*** *** Specific plugin part ***/ typedef struct { - int placeholder; /* nothing plugin specific so far */ -} gras_trp_sg_plug_data_t; + xbt_dict_t sockets; /* all known sockets */ +} s_gras_trp_sg_plug_data_t,*gras_trp_sg_plug_data_t; /*** *** Code ***/ -static void find_port(gras_hostdata_t *hd, int port, - gras_sg_portrec_t *hpd) { - int cpt; - gras_sg_portrec_t pr; - - xbt_assert0(hd,"Please run gras_process_init on each process"); - - xbt_dynar_foreach(hd->ports, cpt, pr) { - if (pr.port == port) { - memcpy(hpd,&pr,sizeof(gras_sg_portrec_t)); - return; - } - } - THROW1(mismatch_error,0,"Unable to find any portrec for port #%d",port); -} - -void -gras_trp_sg_setup(gras_trp_plugin_t plug) { +static void gras_trp_sg_exit(gras_trp_plugin_t plug){ + gras_trp_sg_plug_data_t mydata = (gras_trp_sg_plug_data_t) plug->data; + xbt_dict_free(&(mydata->sockets)); + xbt_free(plug->data); +} +void gras_trp_sg_setup(gras_trp_plugin_t plug) +{ + gras_trp_sg_plug_data_t data = xbt_new(s_gras_trp_sg_plug_data_t, 1); - gras_trp_sg_plug_data_t *data=xbt_new(gras_trp_sg_plug_data_t,1); + plug->data = data; + data->sockets = xbt_dict_new(); - plug->data = data; + plug->exit = gras_trp_sg_exit; plug->socket_client = gras_trp_sg_socket_client; plug->socket_server = gras_trp_sg_socket_server; - plug->socket_close = gras_trp_sg_socket_close; + plug->socket_close = gras_trp_sg_socket_close; - plug->chunk_send = gras_trp_sg_chunk_send; - plug->chunk_recv = gras_trp_sg_chunk_recv; + plug->raw_send = gras_trp_sg_chunk_send_raw; + plug->send = gras_trp_sg_chunk_send; + plug->raw_recv = plug->recv = gras_trp_sg_chunk_recv; - plug->flush = NULL; /* nothing cached */ + plug->flush = NULL; /* nothing cached */ } void gras_trp_sg_socket_client(gras_trp_plugin_t self, - /* OUT */ gras_socket_t sock){ - xbt_ex_t e; + /* OUT */ gras_socket_t sock) { - m_host_t peer; - gras_hostdata_t *hd; + smx_host_t peer; gras_trp_sg_sock_data_t *data; - gras_sg_portrec_t pr; + gras_trp_procdata_t pd= (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id); - /* make sure this socket will reach someone */ - if (!(peer=MSG_get_host_by_name(sock->peer_name))) - THROW1(mismatch_error,0,"Can't connect to %s: no such host.\n",sock->peer_name); - - if (!(hd=(gras_hostdata_t *)MSG_host_get_data(peer))) - THROW1(mismatch_error,0, - "can't connect to %s: no process on this host", - sock->peer_name); - - TRY { - find_port(hd,sock->peer_port,&pr); - } CATCH(e) { - if (e.category == mismatch_error) { - xbt_ex_free(e); - THROW2(mismatch_error,0, - "can't connect to %s:%d, no process listen on this port", - sock->peer_name,sock->peer_port); - } - RETHROW; - } - if (pr.meas && !sock->meas) { - THROW2(mismatch_error,0, - "can't connect to %s:%d in regular mode, the process listen " - "in meas mode on this port",sock->peer_name,sock->peer_port); + if (!(peer = SIMIX_host_get_by_name(sock->peer_name))) + THROW1(mismatch_error, 0, + "Can't connect to %s: no such host", sock->peer_name); + + /* make sure this socket will reach someone */ + xbt_dict_t all_sockets = ((gras_trp_sg_plug_data_t)self->data)->sockets; + char *sock_name=bprintf("%s:%d",sock->peer_name,sock->peer_port); + gras_socket_t server = xbt_dict_get_or_null(all_sockets,sock_name); + free(sock_name); + + if (!server) + THROW2(mismatch_error, 0, + "can't connect to %s:%d, no process listen on this port", + sock->peer_name, sock->peer_port); + + if (server->meas && !sock->meas) { + THROW2(mismatch_error, 0, + "can't connect to %s:%d in regular mode, the process listen " + "in measurement mode on this port", sock->peer_name, + sock->peer_port); } - if (!pr.meas && sock->meas) { - THROW2(mismatch_error,0, - "can't connect to %s:%d in meas mode, the process listen " - "in regular mode on this port",sock->peer_name,sock->peer_port); + if (!server->meas && sock->meas) { + THROW2(mismatch_error, 0, + "can't connect to %s:%d in measurement mode, the process listen " + "in regular mode on this port", sock->peer_name, sock->peer_port); } - /* create the socket */ - data = xbt_new(gras_trp_sg_sock_data_t,1); - data->from_PID = MSG_process_self_PID(); - data->to_PID = hd->proc[ pr.tochan ]; - data->to_host = peer; - data->to_chan = pr.tochan; - + data = xbt_new0(gras_trp_sg_sock_data_t, 1); + data->rdv = ((gras_trp_sg_sock_data_t *)server->data)->rdv; + data->from_process = SIMIX_process_self(); + sock->data = data; sock->incoming = 1; - DEBUG6("%s (PID %d) connects in %s mode to %s:%d (to_PID=%d)", - MSG_process_get_name(MSG_process_self()), MSG_process_self_PID(), - sock->meas?"meas":"regular", - sock->peer_name,sock->peer_port,data->to_PID); + /* Create a smx comm object about this socket */ + data->ongoing_msg_size = sizeof(s_gras_msg_t); + smx_comm_t comm = SIMIX_network_irecv(data->rdv,&(data->ongoing_msg),&(data->ongoing_msg_size)); + xbt_dynar_push(pd->comms,&comm); + + DEBUG5("%s (PID %d) connects in %s mode to %s:%d", + SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(), + sock->meas ? "meas" : "regular", sock->peer_name, sock->peer_port); } -void gras_trp_sg_socket_server(gras_trp_plugin_t self, - gras_socket_t sock){ +void gras_trp_sg_socket_server(gras_trp_plugin_t self, gras_socket_t sock) { + gras_trp_procdata_t pd= (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id); + xbt_dict_t all_sockets = ((gras_trp_sg_plug_data_t)self->data)->sockets; - gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self()); - gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp"); - gras_sg_portrec_t pr; - gras_trp_sg_sock_data_t *data; - int found; - - const char *host=MSG_host_get_name(MSG_host_self()); + /* Make sure that this socket was not opened so far */ + char *sock_name=bprintf("%s:%d",gras_os_myname(),sock->port); + gras_socket_t old = xbt_dict_get_or_null(all_sockets,sock_name); + if (old) + THROW1(mismatch_error, 0, + "can't listen on address %s: port already in use.", + sock_name); - xbt_ex_t e; - xbt_assert0(hd,"Please run gras_process_init on each process"); + /* Create the data associated to the socket */ + gras_trp_sg_sock_data_t *data = xbt_new0(gras_trp_sg_sock_data_t, 1); + data->rdv = SIMIX_rdv_create(sock_name); + data->from_process = SIMIX_process_self(); + SIMIX_rdv_set_data(data->rdv,sock); - sock->accepting = 0; /* no such nuisance in SG */ + sock->is_master = 1; + sock->incoming = 1; - found = 0; - TRY { - find_port(hd,sock->port,&pr); - found = 1; - } CATCH(e) { - if (e.category == mismatch_error) - xbt_ex_free(e); - else - RETHROW; - } - - if (found) - THROW2(mismatch_error,0, - "can't listen on address %s:%d: port already in use.", - host,sock->port); - - pr.tochan = sock->meas ? pd->measChan : pd->chan; - pr.port = sock->port; - pr.meas = sock->meas; - xbt_dynar_push(hd->ports,&pr); - - /* Create the socket */ - data = xbt_new(gras_trp_sg_sock_data_t,1); - data->from_PID = -1; - data->to_PID = MSG_process_self_PID(); - data->to_host = MSG_host_self(); - data->to_chan = pd->chan; - sock->data = data; + /* Register the socket to the set of sockets known simulation-wide */ + xbt_dict_set(all_sockets,sock_name,sock,NULL); /* FIXME: add a function to raise a warning at simulation end for non-closed sockets */ + + /* Create a smx comm object about this socket */ + data->ongoing_msg_size = sizeof(s_gras_msg_t); + smx_comm_t comm = SIMIX_network_irecv(data->rdv,&(data->ongoing_msg),&(data->ongoing_msg_size)); + INFO2("irecv comm %p onto %p",comm,&(data->ongoing_msg)); + xbt_dynar_push(pd->comms,&comm); + VERB6("'%s' (%d) ears on %s:%d%s (%p)", - MSG_process_get_name(MSG_process_self()), MSG_process_self_PID(), - host,sock->port,sock->meas? " (mode meas)":"",sock); + SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(), + gras_os_myname(), sock->port, sock->meas ? " (mode meas)" : "", sock); + free(sock_name); } -void gras_trp_sg_socket_close(gras_socket_t sock){ - gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self()); - int cpt; - - gras_sg_portrec_t pr; +void gras_trp_sg_socket_close(gras_socket_t sock) { + gras_trp_procdata_t pd= (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id); + if (sock->is_master) { + /* server mode socket. Unregister it from 'OS' tables */ + char *sock_name=bprintf("%s:%d",gras_os_myname(),sock->port); - XBT_IN1(" (sock=%p)",sock); - - if (!sock) return; - xbt_assert0(hd,"Please run gras_process_init on each process"); + xbt_dict_t sockets = ((gras_trp_sg_plug_data_t)sock->plugin->data)->sockets; + gras_socket_t old = xbt_dict_get_or_null(sockets,sock_name); + if (!old) + WARN2("socket_close called on the unknown server socket %p (port=%d)", + sock, sock->port); + xbt_dict_remove(sockets,sock_name); + free(sock_name); - if (sock->data) - free(sock->data); + } - if (sock->incoming && sock->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)); - if (pr.port == sock->port) { - xbt_dynar_cursor_rm(hd->ports, &cpt); - XBT_OUT; - return; - } - } - WARN2("socket_close called on the unknown incoming socket %p (port=%d)", - sock,sock->port); + if (sock->data) { + SIMIX_rdv_destroy(((gras_trp_sg_sock_data_t *) sock->data)->rdv); + free(sock->data); } + + xbt_dynar_push(pd->sockets_to_close,&sock); + gras_msg_listener_awake(); + XBT_OUT; } @@ -234,72 +201,68 @@ typedef struct { } sg_task_data_t; void gras_trp_sg_chunk_send(gras_socket_t sock, - const char *data, - unsigned long int size) { - m_task_t task=NULL; - static unsigned int count=0; + 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, + const char *data, unsigned long int size) +{ char name[256]; - gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)sock->data; - sg_task_data_t *task_data; - - sprintf(name,"Chunk[%d]",count++); - - task_data=xbt_new(sg_task_data_t,1); - task_data->data=(void*)xbt_malloc(size); - task_data->size = size; - memcpy(task_data->data,data,size); - - task=MSG_task_create(name,0,((double)size)/(1024.0*1024.0),task_data); - - DEBUG5("send chunk %s from %s to %s:%d (size=%ld)", - name, MSG_host_get_name(MSG_host_self()), - MSG_host_get_name(sock_data->to_host), sock_data->to_chan,size); - if (MSG_task_put(task, sock_data->to_host,sock_data->to_chan) != MSG_OK) { - THROW0(system_error,0,"Problem during the MSG_task_put"); + static unsigned int count = 0; + + gras_trp_sg_sock_data_t *sock_data; + gras_msg_t msg; /* message to send */ + + 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"); + + sprintf(name, "Chunk[%d]", count++); + /*initialize gras message */ + msg = xbt_new(s_gras_msg_t, 1); + msg->expe = sock; + msg->payl_size = size; + + if (data) { + msg->payl = (void *) xbt_malloc(size); + memcpy(msg->payl, data, size); + } else { + msg->payl = NULL; } + SIMIX_network_send(sock_data->rdv,size,-1.,-1.,&msg,sizeof(msg),(smx_comm_t*)&(msg->comm),msg); } -void gras_trp_sg_chunk_recv(gras_socket_t sock, - char *data, - unsigned long int size){ - gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp"); - - m_task_t task=NULL; - sg_task_data_t *task_data; - gras_trp_sg_sock_data_t *sock_data = sock->data; - - XBT_IN; - DEBUG4("recv chunk on %s -> %s:%d (size=%ld)", - MSG_host_get_name(sock_data->to_host), - MSG_host_get_name(MSG_host_self()), sock_data->to_chan, size); - if (MSG_task_get(&task, (sock->meas ? pd->measChan : pd->chan)) != MSG_OK) - THROW0(system_error,0,"Error in MSG_task_get()"); - DEBUG1("Got chuck %s",MSG_task_get_name(task)); - - task_data = MSG_task_get_data(task); - if (size != -1) { - if (task_data->size != size) - THROW5(mismatch_error,0, - "Got %d bytes when %ld where expected (in %s->%s:%d)", - task_data->size, size, - MSG_host_get_name(sock_data->to_host), - MSG_host_get_name(MSG_host_self()), sock_data->to_chan); - memcpy(data,task_data->data,size); - } else { - /* damn, the size is embeeded at the begining of the chunk */ - int netsize; - - memcpy((char*)&netsize,task_data->data,4); - DEBUG1("netsize embeeded = %d",netsize); +int gras_trp_sg_chunk_recv(gras_socket_t sock, + char *data, unsigned long int size) +{ + gras_trp_sg_sock_data_t *sock_data; + gras_msg_t msg_got; + smx_comm_t comm; - memcpy(data,task_data->data,netsize+4); - } - free(task_data->data); - free(task_data); + xbt_assert0(sock->meas, + "SG chunk exchange shouldn't be used on non-measurement sockets"); - if (MSG_task_destroy(task) != MSG_OK) - THROW0(system_error,0,"Error in MSG_task_destroy()"); + sock_data = (gras_trp_sg_sock_data_t *) sock->data; - XBT_OUT; -} + SIMIX_network_recv(sock_data->rdv,-1.,&msg_got,NULL,&comm); + + if (msg_got->payl_size != size) + THROW5(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); + + if (data) + memcpy(data, msg_got->payl, size); + if (msg_got->payl) + xbt_free(msg_got->payl); + + xbt_free(msg_got); + return 0; +}