X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/037955e458fb05c8ad1a1bdc3509bac0664f87a2..8a70fd6e0cc77910dda2e50a7f8bbb864f26c0b9:/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 32134a995e..8debb38f1d 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -1,242 +1,284 @@ -/* $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 "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" -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 (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; + 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; + if (gras_socket_im_the_server(s)) + return SIMIX_host_get_name(SIMIX_req_process_get_host(sockdata->client)); + else { + return SIMIX_host_get_name(SIMIX_req_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) +{ 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=SIMIX_host_get_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 *)SIMIX_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_req_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_req_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_process = SIMIX_process_self(); - data->to_process = pr.process; - data->to_host = peer; - /* initialize mutex and condition of the socket */ - data->mutex = SIMIX_mutex_init(); - data->cond = SIMIX_cond_init(); - data->to_socket = pr.socket; + /* 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_req_rdv_create(NULL); + data->comm_recv = SIMIX_req_comm_irecv(data->rdv_client, &data->msg, NULL, NULL, NULL); + /* connect that simulation data to the socket */ sock->data = data; sock->incoming = 1; - 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); + DEBUG8("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)", + SIMIX_req_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 *)SIMIX_host_get_data(SIMIX_host_self()); + gras_hostdata_t *hd = + (gras_hostdata_t *) SIMIX_host_self_get_data(); gras_sg_portrec_t pr; - gras_trp_sg_sock_data_t *data; - volatile int found; - - const char *host=SIMIX_host_get_name(SIMIX_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.port = sock->port; - pr.meas = sock->meas; - pr.socket = sock; - pr.process = SIMIX_process_self(); - 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_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(); + xbt_dynar_push(hd->ports, &pr); + pr->rdv = SIMIX_req_rdv_create(NULL); + /* Create the socket */ - data = xbt_new(gras_trp_sg_sock_data_t,1); - data->from_process = SIMIX_process_self(); - data->to_process = NULL; - data->to_host = SIMIX_host_self(); - - data->cond = SIMIX_cond_init(); - data->mutex = SIMIX_mutex_init(); + 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_req_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL); sock->data = data; - VERB6("'%s' (%d) ears on %s:%d%s (%p)", - SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(), - 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_req_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, + (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 *)SIMIX_host_get_data(SIMIX_host_self()); - int cpt; - gras_sg_portrec_t pr; +void gras_trp_sg_socket_close(gras_socket_t sock) +{ + gras_hostdata_t *hd = + (gras_hostdata_t *) SIMIX_host_self_get_data(); + unsigned int cpt; + gras_sg_portrec_t pr; - XBT_IN1(" (sock=%p)",sock); - - if (!sock) return; + XBT_IN1(" (sock=%p)", sock); - xbt_assert0(hd,"Please run gras_process_init on each process"); + if (!sock) + return; - if (sock->data) { - SIMIX_cond_destroy(((gras_trp_sg_sock_data_t*)sock->data)->cond); - SIMIX_mutex_destroy(((gras_trp_sg_sock_data_t*)sock->data)->mutex); - free(sock->data); - } + xbt_assert0(hd, "Please run gras_process_init on each process"); - if (sock->incoming && !sock->outgoing && sock->port >= 0) { + 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; - return; + 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; - } typedef struct { @@ -245,150 +287,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) { + const char *data, unsigned long int size) +{ +#ifdef KILLME char name[256]; - static unsigned int count=0; - - smx_action_t act; /* simix action */ - gras_trp_sg_sock_data_t *sock_data; - gras_trp_sg_sock_data_t *remote_sock_data; - gras_hostdata_t *hd; - gras_hostdata_t *remote_hd; - 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; - remote_sock_data = ((gras_trp_sg_sock_data_t *)sock->data)->to_socket->data; - hd = (gras_hostdata_t *)SIMIX_host_get_data(SIMIX_host_self()); - remote_hd = (gras_hostdata_t *)SIMIX_host_get_data(sock_data->to_host); - - 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; + 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_req_process_get_host(remote_dude); } - - /* put message on msg_queue */ - msg_remote_proc = (gras_msg_procdata_t)gras_libdata_by_name_from_remote("gras_msg",sock_data->to_process); - xbt_fifo_push(msg_remote_proc->msg_to_receive_queue,msg); - - /* wake-up the receiver */ - trp_remote_proc = (gras_trp_procdata_t)gras_libdata_by_name_from_remote("gras_trp",sock_data->to_process); - SIMIX_cond_signal(trp_remote_proc->cond); - - SIMIX_mutex_lock(remote_sock_data->mutex); - //SIMIX_mutex_lock(remote_hd->mutex_port[sock->peer_port]); - /* wait for the receiver */ - SIMIX_cond_wait(remote_sock_data->cond,remote_sock_data->mutex); - //SIMIX_cond_wait(remote_hd->cond_port[sock->peer_port], remote_hd->mutex_port[sock->peer_port]); - - /* creates simix action and waits its ends, waits in the sender host condition*/ - DEBUG5("send chunk %s from %s to %s:%d (size=%ld)", - name, SIMIX_host_get_name(SIMIX_host_self()), - SIMIX_host_get_name(sock_data->to_host), sock->peer_port,size); - - act = SIMIX_action_communicate(SIMIX_host_self(), sock_data->to_host, name, size, -1); - /* - SIMIX_register_action_to_condition(act,remote_hd->cond_port[sock->peer_port]); - SIMIX_register_condition_to_action(act,remote_hd->cond_port[sock->peer_port]); - */ - SIMIX_register_action_to_condition(act,remote_sock_data->cond); - SIMIX_register_condition_to_action(act,remote_sock_data->cond); - - SIMIX_host_get_name(sock_data->to_host),SIMIX_process_get_name(sock_data->to_process), - - SIMIX_cond_wait(remote_sock_data->cond,remote_sock_data->mutex); - //SIMIX_cond_wait(remote_hd->cond_port[sock->peer_port], remote_hd->mutex_port[sock->peer_port]); - /* error treatmeant */ - - /* cleanup structures */ - SIMIX_action_destroy(act); - - SIMIX_mutex_unlock(remote_sock_data->mutex); - //SIMIX_mutex_unlock(remote_hd->mutex_port[sock->peer_port]); - SIMIX_cond_signal(remote_sock_data->cond); - //SIMIX_cond_signal(remote_hd->cond_port[sock->peer_port]); + */ + //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); - gras_trp_sg_sock_data_t *sock_data; - gras_hostdata_t *remote_hd; - gras_hostdata_t *local_hd; + char *data, unsigned long int size) +{ + //gras_trp_sg_sock_data_t *sock_data = + // (gras_trp_sg_sock_data_t *) sock->data; + + //SIMIX_req_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; gras_msg_t msg_got; - gras_msg_procdata_t msg_procdata = (gras_msg_procdata_t)gras_libdata_by_name("gras_msg"); - - xbt_assert0(sock->meas, "SG chunk exchange shouldn't be used on non-measurement sockets"); - - SIMIX_mutex_lock(pd->mutex); - if (xbt_fifo_size(msg_procdata->msg_to_receive_queue) == 0 ) { - SIMIX_cond_wait_timeout(pd->cond,pd->mutex,60); - } - if (xbt_fifo_size(msg_procdata->msg_to_receive_queue) == 0 ) { - THROW0(timeout_error,0,"Timeout"); - } - SIMIX_mutex_unlock(pd->mutex); - - sock_data = (gras_trp_sg_sock_data_t *)sock->data; - DEBUG3("Remote host %s, Remote Port: %d Local port %d", SIMIX_host_get_name(sock_data->to_host), sock->peer_port, sock->port); - remote_hd = (gras_hostdata_t *)SIMIX_host_get_data(sock_data->to_host); - local_hd = (gras_hostdata_t *)SIMIX_host_get_data(SIMIX_host_self()); - - + 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"); + } - msg_got = xbt_fifo_shift(msg_procdata->msg_to_receive_queue); + remote_sock_data = (gras_trp_sg_sock_data_t *) remote_socket->data; + msg_got = xbt_fifo_shift(msg_procdata->msg_to_receive_queue_meas); - SIMIX_mutex_lock(sock_data->mutex); - //SIMIX_mutex_lock(local_hd->mutex_port[sock->port]); -/* ok, I'm here, you can continue the communication */ - SIMIX_cond_signal(sock_data->cond); - //SIMIX_cond_signal(local_hd->cond_port[sock->port]); + sock_data = (gras_trp_sg_sock_data_t *) sock->data; -/* wait for communication end */ - SIMIX_cond_wait(sock_data->cond,sock_data->mutex); - //SIMIX_cond_wait(local_hd->cond_port[sock->port],local_hd->mutex_port[sock->port]); + /* ok, I'm here, you can continue the communication */ + SIMIX_req_cond_signal(remote_sock_data->cond); + SIMIX_req_mutex_lock(remote_sock_data->mutex); + /* wait for communication end */ + SIMIX_req_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_cond_wait(sock_data->cond,sock_data->mutex); - SIMIX_mutex_unlock(sock_data->mutex); - //SIMIX_mutex_unlock(local_hd->mutex_port[sock->port]); - /* - SIMIX_cond_wait(local_hd->cond_port[sock->port],local_hd->mutex_port[sock->port]); - SIMIX_mutex_unlock(local_hd->mutex_port[sock->port]); - */ - return 0; + THROW5(mismatch_error, 0, + "Got %d bytes when %ld where expected (in %s->%s:%d)", + msg_got->payl_size, size, + SIMIX_req_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); + SIMIX_req_mutex_unlock(remote_sock_data->mutex); +#endif + return 0; } -