X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/063c63642a29000a011c0d6176d30eb62a4e0dca..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 a80c33118b..f83b704373 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -1,18 +1,18 @@ -/* $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 "simix/simix.h" #include "gras/Msg/msg_private.h" #include "gras/Transport/transport_private.h" #include "gras/Virtu/virtu_sg.h" @@ -24,10 +24,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp, *** Prototypes ***/ +/* 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, + const char*host, + int port, /* OUT */ gras_socket_t sock); void gras_trp_sg_socket_server(gras_trp_plugin_t self, + int port, /* OUT */ gras_socket_t sock); void gras_trp_sg_socket_close(gras_socket_t sd); @@ -44,27 +49,70 @@ int gras_trp_sg_chunk_recv(gras_socket_t sd, *** Specific plugin part ***/ typedef struct { - xbt_dict_t sockets; /* all known sockets */ -} s_gras_trp_sg_plug_data_t,*gras_trp_sg_plug_data_t; + int placeholder; /* nothing plugin specific so far */ +} gras_trp_sg_plug_data_t; /*** *** Code ***/ +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_dynar_foreach(hd->ports, cpt, pr) { + if (pr->port == port) + return pr; + } + return NULL; +} -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); +/*** + *** 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 + return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->server)); +} +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) { - gras_trp_sg_plug_data_t data = xbt_new(s_gras_trp_sg_plug_data_t, 1); - plug->data = data; - data->sockets = xbt_dict_new(); + 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); - plug->exit = gras_trp_sg_exit; + plug->data = data; plug->socket_client = gras_trp_sg_socket_client; plug->socket_server = gras_trp_sg_socket_server; @@ -78,120 +126,156 @@ void gras_trp_sg_setup(gras_trp_plugin_t plug) } 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) +{ smx_host_t peer; - gras_trp_sg_sock_data_t *data; - gras_trp_procdata_t pd= (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id); + gras_hostdata_t *hd; + gras_trp_sg_sock_data_t data; + gras_sg_portrec_t pr; + /* make sure this socket will reach someone */ + if (!(peer = SIMIX_host_get_by_name(host))) + THROW1(mismatch_error, 0, + "Can't connect to %s: no such host.\n", host); - if (!(peer = SIMIX_host_get_by_name(sock->peer_name))) + if (!(hd = (gras_hostdata_t *) SIMIX_host_get_data(peer))) THROW1(mismatch_error, 0, - "Can't connect to %s: no such host", sock->peer_name); + "can't connect to %s: no process on this host", + host); - /* 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); + pr = find_port(hd, port); - if (!server) + if (pr == NULL) { THROW2(mismatch_error, 0, "can't connect to %s:%d, no process listen on this port", - sock->peer_name, sock->peer_port); + host, port); + } - if (server->meas && !sock->meas) { + /* 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", sock->peer_name, - sock->peer_port); + "in measurement mode on this port", host, + port); } - if (!server->meas && sock->meas) { + 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", sock->peer_name, sock->peer_port); + "in regular mode on this port", host, + port); } - /* create the socket */ - 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(); + /* create simulation data of the socket */ + data = xbt_new(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; - /* 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", + 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", sock->peer_name, sock->peer_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, 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; +void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t sock) +{ - /* 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); + 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; + 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 = 1; - sock->is_master = 1; - sock->incoming = 1; + /* Check whether a server is already listening on that port or not */ + pr = find_port(hd, port); - sock->data = data; + 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(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); - /* 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 */ + sock->data = data; - /* 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); + 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); - VERB6("'%s' (%d) ears on %s:%d%s (%p)", - 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_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); +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_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); + XBT_IN1(" (sock=%p)", sock); - } + if (!sock) + return; + + 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 == 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, sockdata->server_port); + } if (sock->data) { - SIMIX_rdv_destroy(((gras_trp_sg_sock_data_t *) sock->data)->rdv); + /* FIXME: kill the rdv point if receiver side */ free(sock->data); } - - xbt_dynar_push(pd->sockets_to_close,&sock); - gras_msg_listener_awake(); - XBT_OUT; } @@ -210,45 +294,72 @@ void gras_trp_sg_chunk_send(gras_socket_t sock, void gras_trp_sg_chunk_send_raw(gras_socket_t sock, const char *data, unsigned long int size) { +#ifdef KILLME char name[256]; static unsigned int count = 0; - gras_trp_sg_sock_data_t *sock_data; + 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 */ - 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"); - 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; + + /* 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.,&msg,sizeof(msg),(smx_comm_t*)&(msg->comm),msg); + */ + //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_sg_sock_data_t *sock_data; + //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; - smx_comm_t comm; + 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"); + } + + 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; - SIMIX_network_recv(sock_data->rdv,-1.,&msg_got,NULL,&comm); + /* 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, @@ -264,5 +375,7 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock, xbt_free(msg_got->payl); xbt_free(msg_got); + SIMIX_mutex_unlock(remote_sock_data->mutex); +#endif return 0; }