X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de6fe5331b6bca5f67584856912729a0814118ef..a6a92abfb622b4e667e6853a5f39f6f003007588:/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 0e4a950f9c..7b0425d269 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -6,49 +6,42 @@ /* exchange in SG realm is implemented directly without mimicing real life */ /* This would be terribly unefficient. */ -/* Authors: Martin Quinson */ -/* Copyright (C) 2004 Martin Quinson. */ +/* Copyright (c) 2004 Martin Quinson. 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ -#include +#include "msg/msg.h" -#include "gras_private.h" #include "transport_private.h" -#include "Virtu/virtu_sg.h" +#include "gras/Virtu/virtu_sg.h" -GRAS_LOG_EXTERNAL_CATEGORY(transport); -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(trp_sg,transport); +XBT_LOG_EXTERNAL_CATEGORY(transport); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_sg,transport,"SimGrid pseudo-transport"); /*** *** Prototypes ***/ +hexa_print(unsigned char *data, int size); /* in gras.c */ + /* retrieve the port record associated to a numerical port on an host */ -static gras_error_t find_port(gras_hostdata_t *hd, int port, +static xbt_error_t find_port(gras_hostdata_t *hd, int port, gras_sg_portrec_t *hpd); -gras_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, - const char *host, - unsigned short port, - /* OUT */ gras_socket_t *sock); -gras_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, - unsigned short port, - /* OUT */ gras_socket_t *sock); -void gras_trp_sg_socket_close(gras_socket_t *sd); +xbt_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, + /* OUT */ gras_socket_t sock); +xbt_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, + /* OUT */ gras_socket_t sock); +void gras_trp_sg_socket_close(gras_socket_t sd); -gras_error_t gras_trp_sg_chunk_send(gras_socket_t *sd, - char *data, - size_t size); +xbt_error_t gras_trp_sg_chunk_send(gras_socket_t sd, + const char *data, + long int size); -gras_error_t gras_trp_sg_chunk_recv(gras_socket_t *sd, +xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sd, char *data, - size_t size); - -/* FIXME - gras_error_t gras_trp_sg_flush(gras_socket_t *sd); -*/ + long int size); /*** *** Specific plugin part @@ -61,16 +54,16 @@ typedef struct { /*** *** Code ***/ -static gras_error_t find_port(gras_hostdata_t *hd, int port, +static xbt_error_t find_port(gras_hostdata_t *hd, int port, gras_sg_portrec_t *hpd) { int cpt; - gras_sg_portrec_t pd; + gras_sg_portrec_t pr; - gras_assert0(hd,"Please run gras_process_init on each process"); + xbt_assert0(hd,"Please run gras_process_init on each process"); - gras_dynar_foreach(hd->ports, cpt, pd) { - if (pd.port == port) { - memcpy(hpd,&pd,sizeof(gras_sg_portrec_t)); + xbt_dynar_foreach(hd->ports, cpt, pr) { + if (pr.port == port) { + memcpy(hpd,&pr,sizeof(gras_sg_portrec_t)); return no_error; } } @@ -78,13 +71,10 @@ static gras_error_t find_port(gras_hostdata_t *hd, int port, } -gras_error_t +xbt_error_t gras_trp_sg_setup(gras_trp_plugin_t *plug) { - gras_trp_sg_plug_data_t *data=malloc(sizeof(gras_trp_sg_plug_data_t)); - - if (!data) - RAISE_MALLOC; + gras_trp_sg_plug_data_t *data=xbt_new(gras_trp_sg_plug_data_t,1); plug->data = data; @@ -95,16 +85,15 @@ gras_trp_sg_setup(gras_trp_plugin_t *plug) { plug->chunk_send = gras_trp_sg_chunk_send; plug->chunk_recv = gras_trp_sg_chunk_recv; + plug->flush = NULL; /* nothing cached */ return no_error; } -gras_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, - const char *host, - unsigned short port, - /* OUT */ gras_socket_t *sock){ +xbt_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, + /* OUT */ gras_socket_t sock){ - gras_error_t errcode; + xbt_error_t errcode; m_host_t peer; gras_hostdata_t *hd; @@ -112,92 +101,91 @@ gras_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, gras_sg_portrec_t pr; /* make sure this socket will reach someone */ - if (!(peer=MSG_get_host_by_name(host))) { - fprintf(stderr,"GRAS: can't connect to %s: no such host.\n",host); + if (!(peer=MSG_get_host_by_name(sock->peer_name))) { + fprintf(stderr,"GRAS: can't connect to %s: no such host.\n",sock->peer_name); return mismatch_error; } if (!(hd=(gras_hostdata_t *)MSG_host_get_data(peer))) { RAISE1(mismatch_error, "can't connect to %s: no process on this host", - host); + sock->peer_name); } - errcode = find_port(hd,port,&pr); + errcode = find_port(hd,sock->peer_port,&pr); if (errcode != no_error && errcode != mismatch_error) return errcode; if (errcode == mismatch_error) { RAISE2(mismatch_error, "can't connect to %s:%d, no process listen on this port", - host,port); + sock->peer_name,sock->peer_port); } if (pr.raw && !sock->raw) { RAISE2(mismatch_error, "can't connect to %s:%d in regular mode, the process listen " - "in raw mode on this port",host,port); + "in raw mode on this port",sock->peer_name,sock->peer_port); } if (!pr.raw && sock->raw) { RAISE2(mismatch_error, "can't connect to %s:%d in raw mode, the process listen " - "in regular mode on this port",host,port); + "in regular mode on this port",sock->peer_name,sock->peer_port); } /* create the socket */ - if (!(data = malloc(sizeof(gras_trp_sg_sock_data_t)))) - RAISE_MALLOC; - + 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; 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->raw?"RAW":"regular",host,port,data->to_PID); + sock->raw?"RAW":"regular", + sock->peer_name,sock->peer_port,data->to_PID); return no_error; } -gras_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, - unsigned short port, - gras_socket_t *sock){ +xbt_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, + gras_socket_t sock){ - gras_error_t errcode; + xbt_error_t errcode; gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self()); - gras_procdata_t *pd=gras_procdata_get(); + 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; const char *host=MSG_host_get_name(MSG_host_self()); - gras_assert0(hd,"Please run gras_process_init on each process"); + xbt_assert0(hd,"Please run gras_process_init on each process"); sock->accepting = 0; /* no such nuisance in SG */ - errcode = find_port(hd,port,&pr); + errcode = find_port(hd,sock->port,&pr); switch (errcode) { case no_error: /* Port already used... */ RAISE2(mismatch_error, "can't listen on address %s:%d: port already in use\n.", - host,port); + host,sock->port); + break; case mismatch_error: /* Port not used so far. Do it */ pr.tochan = sock->raw ? pd->rawChan : pd->chan; - pr.port = port; + pr.port = sock->port; pr.raw = sock->raw; - TRY(gras_dynar_push(hd->ports,&pr)); + xbt_dynar_push(hd->ports,&pr); + break; default: return errcode; } /* Create the socket */ - if (!(data = malloc(sizeof(gras_trp_sg_sock_data_t)))) - RAISE_MALLOC; - + 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(); @@ -205,34 +193,40 @@ gras_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, sock->data = data; - INFO6("'%s' (%d) ears on %s:%d%s (%p)", + VERB6("'%s' (%d) ears on %s:%d%s (%p)", MSG_process_get_name(MSG_process_self()), MSG_process_self_PID(), - host,port,sock->raw? " (mode RAW)":"",*sock); + host,sock->port,sock->raw? " (mode RAW)":"",sock); return no_error; } -void gras_trp_sg_socket_close(gras_socket_t *sock){ +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; + + gras_sg_portrec_t pr; + XBT_IN1(" (sock=%p)",sock); + if (!sock) return; - gras_assert0(hd,"Please run gras_process_init on each process"); + xbt_assert0(hd,"Please run gras_process_init on each process"); - free(sock->data); + if (sock->data) + free(sock->data); if (sock->incoming) { /* server mode socket. Un register it from 'OS' tables */ - gras_dynar_foreach(hd->ports, cpt, pr) { - if (pr->port == sock->port) { - gras_dynar_cursor_rm(hd->ports, &cpt); - - return; + 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; } } WARN0("socket_close called on an unknown socket"); } + XBT_OUT; } typedef struct { @@ -240,28 +234,27 @@ typedef struct { void *data; } sg_task_data_t; -gras_error_t gras_trp_sg_chunk_send(gras_socket_t *sock, - char *data, - size_t size) { +xbt_error_t gras_trp_sg_chunk_send(gras_socket_t sock, + const char *data, + long int size) { m_task_t task=NULL; static unsigned int count=0; char name[256]; - gras_trp_sg_sock_data_t *sock_data; + gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)sock->data; sg_task_data_t *task_data; - sock_data = (gras_trp_sg_sock_data_t *)sock->data; - sprintf(name,"Chunk[%d]",count++); - if (!(task_data=malloc(sizeof(sg_task_data_t)))) - RAISE_MALLOC; - if (!(task_data->data=malloc(size))) - RAISE_MALLOC; + 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) { RAISE0(system_error,"Problem during the MSG_task_put"); } @@ -269,34 +262,120 @@ gras_error_t gras_trp_sg_chunk_send(gras_socket_t *sock, return no_error; } -gras_error_t gras_trp_sg_chunk_recv(gras_socket_t *sock, +xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sock, char *data, - size_t size){ - gras_procdata_t *pd=gras_procdata_get(); + 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->raw ? pd->rawChan : pd->chan)) != MSG_OK) RAISE0(unknown_error,"Error in MSG_task_get()"); + DEBUG1("Got chuck %s",MSG_task_get_name(task)); task_data = MSG_task_get_data(task); - gras_assert2(task_data->size == size, - "Got %d bytes when %d where expected", - task_data->size, size); - memcpy(data,task_data->data,size); + if (size != -1) { + if (task_data->size != size) + RAISE5(mismatch_error, + "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); + netsize = (int)ntohl(netsize); + DEBUG1("netsize embeeded = %d",netsize); + + memcpy(data,task_data->data,netsize+4); + } free(task_data->data); free(task_data); if (MSG_task_destroy(task) != MSG_OK) RAISE0(unknown_error,"Error in MSG_task_destroy()"); + XBT_OUT; return no_error; } -/*FIXME +/* Data exchange over raw sockets */ +xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, + int sender, + unsigned int timeout, + unsigned long int expSize, + unsigned long int msgSize) { + unsigned int bytesTotal; + static unsigned int count=0; + m_task_t task=NULL; + char name[256]; + gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)peer->data; + + gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp"); + double startTime; + + startTime=gras_os_time(); /* used only in sender mode */ + + for(bytesTotal = 0; bytesTotal < expSize; bytesTotal += msgSize) { -gras_error_t gras_trp_sg_flush(gras_socket_t *sd){ - RAISE_UNIMPLEMENTED; + if (sender) { + + sprintf(name,"Raw data[%d]",count++); + + task=MSG_task_create(name,0,((double)msgSize)/(1024.0*1024.0),NULL); + + DEBUG5("%f:%s: gras_socket_raw_send(%f %s -> %s) BEGIN", + gras_os_time(), MSG_process_get_name(MSG_process_self()), + ((double)msgSize)/(1024.0*1024.0), + MSG_host_get_name( MSG_host_self()), peer->peer_name); + + if (MSG_task_put(task, sock_data->to_host,sock_data->to_chan) != MSG_OK) + RAISE0(system_error,"Problem during the MSG_task_put()"); + + DEBUG5("%f:%s: gras_socket_raw_send(%f %s -> %s) END", + gras_os_time(), MSG_process_get_name(MSG_process_self()), + ((double)msgSize)/(1024.0*1024.0), + MSG_host_get_name( MSG_host_self()), peer->peer_name); + + } else { /* we are receiver, simulate a select */ + + task=NULL; + DEBUG2("%f:%s: gras_socket_raw_recv() BEGIN\n", + gras_os_time(), MSG_process_get_name(MSG_process_self())); + do { + if (MSG_task_Iprobe((m_channel_t) pd->rawChan)) { + if (MSG_task_get(&task, (m_channel_t) pd->rawChan) != MSG_OK) { + fprintf(stderr,"GRAS: Error in MSG_task_get()\n"); + return unknown_error; + } + + if (MSG_task_destroy(task) != MSG_OK) { + fprintf(stderr,"GRAS: Error in MSG_task_destroy()\n"); + return unknown_error; + } + + DEBUG2("%f:%s: gras_socket_raw_recv() END\n", + gras_os_time(), MSG_process_get_name(MSG_process_self())); + break; + } else { + MSG_process_sleep(0.0001); + } + + } while (gras_os_time() - startTime < timeout); + + if (gras_os_time() - startTime > timeout) + return timeout_error; + } /* receiver part */ + } /* foreach msg */ + + return no_error; } -*/