X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58a5fef8735699a10762fe2bb8f1f938fba4b651..b28635d8ae9d5ce25acb5d2a27268a1ab94f9560:/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 fdf2fe4b8f..6cd4c728ab 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -1,232 +1,292 @@ -/* $Id$ */ - /* file trp (transport) - send/receive a bunch of bytes in SG realm */ /* Note that this is only used to debug other parts of GRAS since message */ /* exchange in SG realm is implemented directly without mimicing real life */ /* This would be terribly unefficient. */ -/* Copyright (c) 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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 "msg/msg.h" +#include "xbt/ex.h" -#include "transport_private.h" +#include "simix/simix.h" +#include "gras/Msg/msg_private.h" +#include "gras/Transport/transport_private.h" #include "gras/Virtu/virtu_sg.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg,gras_trp,"SimGrid pseudo-transport"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp, + "SimGrid pseudo-transport"); /*** *** Prototypes ***/ /* 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); - +static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port); void gras_trp_sg_socket_client(gras_trp_plugin_t self, - /* OUT */ gras_socket_t sock); + const char*host, + int port, + /* OUT */ gras_socket_t sock); void gras_trp_sg_socket_server(gras_trp_plugin_t self, - /* OUT */ gras_socket_t sock); + int port, + /* 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); + const char *data, unsigned long int size); void gras_trp_sg_chunk_send(gras_socket_t sd, - const char *data, - unsigned long int size, - int stable_ignored); + const char *data, + unsigned long int size, int stable_ignored); int gras_trp_sg_chunk_recv(gras_socket_t sd, - char *data, - unsigned long int size); + char *data, unsigned long int size); /*** *** Specific plugin part ***/ typedef struct { - int placeholder; /* nothing plugin specific so far */ + int placeholder; /* nothing plugin specific so far */ } gras_trp_sg_plug_data_t; /*** *** Code ***/ -static void find_port(gras_hostdata_t *hd, int port, - gras_sg_portrec_t *hpd) { - int cpt; +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_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; + if (pr->port == port) + return pr; + } + return NULL; +} + +/*** + *** 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; + if (sockdata->rdv_client == NULL) /* Master socket, I'm server */ + 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; + if (sockdata->server == SIMIX_process_self()) + 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; + if (sockdata->server == SIMIX_process_self()) + return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->client)); + else { + if (sockdata->client!=SIMIX_process_self()) { + /* 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*)s)[sizeof(*s)+1] = '0'; /* Try to make valgrind angry to see where that damn socket comes from */ + xbt_die(bprintf("I'm not the client in socket %p (comm:%p, rdvser=%p, rdvcli=%p) to %s, that's %s", + socket,sockdata->comm_recv,sockdata->rdv_server,sockdata->rdv_client, + SIMIX_host_get_name(SIMIX_process_get_host(sockdata->server)), + SIMIX_host_get_name(SIMIX_process_get_host(sockdata->client)))); } + xbt_assert(sockdata->client_port==gras_os_myport()); + return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->server)); } - THROW1(mismatch_error,0,"Unable to find any portrec for port #%d",port); +} +static const char* gras_trp_sg_peer_proc(gras_socket_t s) { + THROW_UNIMPLEMENTED; +} +static void gras_trp_sg_peer_proc_set(gras_socket_t s,char *name) { + THROW_UNIMPLEMENTED; } +void gras_trp_sg_setup(gras_trp_plugin_t plug) +{ -void -gras_trp_sg_setup(gras_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; + plug->peer_proc = gras_trp_sg_peer_proc; + plug->peer_proc_set = gras_trp_sg_peer_proc_set; - gras_trp_sg_plug_data_t *data=xbt_new(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; + plug->data = data; 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->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; + const char*host, + int port, + /* OUT */ gras_socket_t sock) +{ - m_host_t peer; + smx_host_t peer; gras_hostdata_t *hd; - gras_trp_sg_sock_data_t *data; + gras_trp_sg_sock_data_t data; gras_sg_portrec_t pr; /* 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 (!(peer = SIMIX_host_get_by_name(host))) + THROW1(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, + "can't connect to %s: no process on this host", + host); + + pr = find_port(hd, port); + + if (pr == NULL) { + THROW2(mismatch_error, 0, + "can't connect to %s:%d, no process listen on this port", + host, port); } - 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); + /* Ensure that the listener is expecting the kind of stuff we want to send */ + if (pr->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", host, + 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 (!pr->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", host, + 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; - + /* create simulation data of the socket */ + data = xbt_new0(s_gras_trp_sg_sock_data_t, 1); + 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; + data->rdv_client = SIMIX_rdv_create(NULL); + data->comm_recv = SIMIX_network_irecv(data->rdv_client, NULL, 0); + + /* connect that simulation data to the socket */ 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); + 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, + data->rdv_server,data->rdv_client,data->comm_recv); } -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, int port, gras_socket_t sock) +{ - 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_by_id(gras_trp_libdata_id); + gras_hostdata_t *hd = + (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self()); gras_sg_portrec_t pr; - gras_trp_sg_sock_data_t *data; - int found; - - const char *host=MSG_host_get_name(MSG_host_self()); - - xbt_ex_t e; - - xbt_assert0(hd,"Please run gras_process_init on each process"); - - sock->accepting = 0; /* no such nuisance in SG */ - - 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); - + gras_trp_sg_sock_data_t data; + + xbt_assert0(hd, "Please run gras_process_init on each process"); + + sock->accepting = 1; + + /* Check whether a server is already listening on that port or not */ + pr = find_port(hd, port); + + if (pr) + THROW2(mismatch_error, 0, + "can't listen on address %s:%d: port already in use.", + SIMIX_host_get_name(SIMIX_host_self()), 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); + /* 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; - + data = xbt_new0(s_gras_trp_sg_sock_data_t, 1); + data->server = SIMIX_process_self(); + data->server_port = port; + data->client = NULL; + data->rdv_server = pr->rdv; + data->rdv_client = NULL; + data->comm_recv = SIMIX_network_irecv(pr->rdv, NULL, 0); + sock->data = data; - 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); + VERB10 + ("'%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, + sock->meas ? " (mode meas)" : "", sock, data, + (data->server == + SIMIX_process_self())? data->rdv_server : data->rdv_client, + (data->server == + SIMIX_process_self())? data->rdv_client : data->rdv_server, + data->comm_recv); + } -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; - +void gras_trp_sg_socket_close(gras_socket_t sock) +{ + gras_hostdata_t *hd = + (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self()); + unsigned int cpt; gras_sg_portrec_t pr; - XBT_IN1(" (sock=%p)",sock); - - if (!sock) return; - xbt_assert0(hd,"Please run gras_process_init on each process"); + XBT_IN1(" (sock=%p)", sock); - if (sock->data) - free(sock->data); + if (!sock) + return; - if (sock->incoming && sock->port >= 0) { + xbt_assert0(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)); - if (pr.port == sock->port) { - xbt_dynar_cursor_rm(hd->ports, &cpt); - XBT_OUT; + if (pr->port == sockdata->server_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); + WARN2 + ("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; } @@ -237,81 +297,97 @@ typedef struct { } sg_task_data_t; void gras_trp_sg_chunk_send(gras_socket_t sock, - const char *data, - unsigned long int size, - int stable_ignored) { - gras_trp_sg_chunk_send_raw(sock,data,size); + 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) { - m_task_t task=NULL; - static unsigned int count=0; + const char *data, unsigned long int size) +{ +#ifdef KILLME 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; - - xbt_assert0(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets"); - - sprintf(name,"Chunk[%d]",count++); - - task_data=xbt_new(sg_task_data_t,1); - task_data->size = size; - if (data) { - task_data->data=(void*)xbt_malloc(size); - memcpy(task_data->data,data,size); - } else { - task_data->data = NULL; - } - - task=MSG_task_create(name,0,((double)size),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; + + smx_action_t act; /* simix action */ + gras_trp_procdata_t trp_remote_proc; + 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; + 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; } int 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_by_id(gras_trp_libdata_id); - - m_task_t task=NULL; - sg_task_data_t *task_data; - gras_trp_sg_sock_data_t *sock_data = sock->data; - - xbt_assert0(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets"); - 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_with_time_out(&task, - (sock->meas ? pd->measChan : pd->chan), - 60) != 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 (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); - if (data) - memcpy(data,task_data->data,size); - if (task_data->data) - free(task_data->data); - free(task_data); - - if (MSG_task_destroy(task) != MSG_OK) - THROW0(system_error,0,"Error in MSG_task_destroy()"); + 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); + THROW_UNIMPLEMENTED; +#ifdef KILLME + gras_trp_sg_sock_data_t *remote_sock_data; + gras_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, + "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"); + } - XBT_OUT; - return size; -} + remote_sock_data = (gras_trp_sg_sock_data_t *) remote_socket->data; + msg_got = xbt_fifo_shift(msg_procdata->msg_to_receive_queue_meas); + + 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); + SIMIX_mutex_lock(remote_sock_data->mutex); + /* wait for communication end */ + SIMIX_cond_wait(remote_sock_data->cond, remote_sock_data->mutex); + + 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); + SIMIX_mutex_unlock(remote_sock_data->mutex); +#endif + return 0; +}