From d01820c429f4044f03d88363672e31d307e047a2 Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 6 Jun 2005 22:20:01 +0000 Subject: [PATCH] rename raw sockets to measurement ones git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1360 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/Transport/rl_transport.c | 2 +- src/gras/Transport/sg_transport.c | 10 +++--- src/gras/Transport/transport.c | 36 +++++++++++---------- src/gras/Transport/transport_interface.h | 2 +- src/gras/Transport/transport_plugin_sg.c | 38 ++++++++++++----------- src/gras/Transport/transport_plugin_tcp.c | 23 +++++++------- src/gras/Transport/transport_private.h | 6 ++-- src/gras/Virtu/sg_process.c | 18 +++++------ src/gras/Virtu/virtu_sg.h | 2 +- 9 files changed, 72 insertions(+), 65 deletions(-) diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c index 1003eeabfe..886cbe6ae7 100644 --- a/src/gras/Transport/rl_transport.c +++ b/src/gras/Transport/rl_transport.c @@ -160,7 +160,7 @@ gras_trp_select(double timeout, DEBUG2("accepted=%p,&accepted=%p",accepted,&accepted); TRY((sock_iter->plugin->socket_accept)(sock_iter,&accepted)); - accepted->raw = sock_iter->raw; + accepted->meas = sock_iter->meas; } else { #if 0 FIXME: this fails of files. quite logical diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c index 8567f36e33..2702998ca0 100644 --- a/src/gras/Transport/sg_transport.c +++ b/src/gras/Transport/sg_transport.c @@ -55,7 +55,7 @@ gras_trp_select(double timeout, DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter); sockdata = sock_iter->data; - if (sock_iter->raw || !sock_iter->outgoing) + if (sock_iter->meas || !sock_iter->outgoing) continue; if (sockdata->from_PID == r_pid) { @@ -101,8 +101,8 @@ gras_trp_select(double timeout, xbt_dynar_foreach(remote_hd->ports, cpt, pr) { if (sockdata->to_chan == pr.tochan) { - if (pr.raw) { - DEBUG0("Damn, it's raw"); + if (pr.meas) { + DEBUG0("Damn, it's for measurement"); continue; } @@ -115,10 +115,10 @@ gras_trp_select(double timeout, } } if ((*dst)->peer_port == -10) { - /* was raw */ + /* was for measurement */ sockdata->to_chan = -1; } else { - /* found it, don't let it override by raw */ + /* found it, don't let it override by meas */ break; } } diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 6cb3f1e5bd..d16b61dd52 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -11,7 +11,7 @@ #include "gras/Transport/transport_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network"); -XBT_LOG_NEW_SUBCATEGORY(raw_trp,transport,"Conveying bytes over the network without formating"); +XBT_LOG_NEW_SUBCATEGORY(meas_trp,transport,"Conveying bytes over the network without formating for perf measurements"); static short int _gras_trp_started = 0; static xbt_dict_t _gras_trp_plugins; /* All registered plugins */ @@ -153,7 +153,7 @@ void gras_trp_socket_new(int incoming, sock->port = -1; sock->peer_port = -1; sock->peer_name = NULL; - sock->raw = 0; + sock->meas = 0; *dst = sock; @@ -172,7 +172,7 @@ xbt_error_t gras_socket_server_ext(unsigned short port, unsigned long int bufSize, - int raw, + int measurement, /* OUT */ gras_socket_t *dst) { @@ -192,7 +192,7 @@ gras_socket_server_ext(unsigned short port, sock->plugin= trp; sock->port=port; sock->bufSize = bufSize; - sock->raw = raw; + sock->meas = measurement; /* Call plugin socket creation function */ DEBUG1("Prepare socket with plugin (fct=%p)",trp->socket_server); @@ -223,7 +223,7 @@ gras_socket_client_ext(const char *host, unsigned short port, unsigned long int bufSize, - int raw, + int meas, /* OUT */ gras_socket_t *dst) { @@ -242,7 +242,7 @@ gras_socket_client_ext(const char *host, sock->peer_port = port; sock->peer_name = (char*)strdup(host?host:"localhost"); sock->bufSize = bufSize; - sock->raw = raw; + sock->meas = meas; /* plugin-specific */ errcode= (*trp->socket_client)(trp, sock); @@ -375,7 +375,7 @@ char *gras_socket_peer_name(gras_socket_t sock) { return sock->peer_name; } -xbt_error_t gras_socket_raw_send(gras_socket_t peer, +xbt_error_t gras_socket_meas_send(gras_socket_t peer, unsigned int timeout, unsigned long int exp_size, unsigned long int msg_size) { @@ -383,22 +383,24 @@ xbt_error_t gras_socket_raw_send(gras_socket_t peer, char *chunk = xbt_malloc(msg_size); int exp_sofar; - xbt_assert0(peer->raw,"Asked to send raw data on a regular socket"); + XBT_IN; + xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket"); for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) { - CDEBUG5(raw_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d", + CDEBUG5(meas_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); TRY(gras_trp_chunk_send(peer,chunk,msg_size)); } - CDEBUG5(raw_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d", + CDEBUG5(meas_trp,"Sent %d of %lu (msg_size=%ld) to %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); free(chunk); - return no_error;/* gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize); */ + XBT_OUT; + return no_error;/* gras_socket_meas_exchange(peer,1,timeout,expSize,msgSize); */ } -xbt_error_t gras_socket_raw_recv(gras_socket_t peer, +xbt_error_t gras_socket_meas_recv(gras_socket_t peer, unsigned int timeout, unsigned long int exp_size, unsigned long int msg_size){ @@ -407,19 +409,21 @@ xbt_error_t gras_socket_raw_recv(gras_socket_t peer, char *chunk = xbt_malloc(msg_size); int exp_sofar; - xbt_assert0(peer->raw,"Asked to recveive raw data on a regular socket\n"); + XBT_IN; + xbt_assert0(peer->meas,"Asked to receive measurement data on a regular socket\n"); for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) { - CDEBUG5(raw_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d", + CDEBUG5(meas_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); TRY(gras_trp_chunk_recv(peer,chunk,msg_size)); } - CDEBUG5(raw_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d", + CDEBUG5(meas_trp,"Recvd %d of %lu (msg_size=%ld) from %s:%d", exp_sofar,exp_size,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); free(chunk); - return no_error;/* gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize); */ + XBT_OUT; + return no_error;/* gras_socket_meas_exchange(peer,0,timeout,expSize,msgSize); */ } /* diff --git a/src/gras/Transport/transport_interface.h b/src/gras/Transport/transport_interface.h index 7400183ea4..cf1f5a03e5 100644 --- a/src/gras/Transport/transport_interface.h +++ b/src/gras/Transport/transport_interface.h @@ -83,7 +83,7 @@ gras_trp_plugin_get_by_name(const char *name, typedef struct { /* SG only elements. In RL, they are part of the OS ;) */ int chan; /* Formated messages channel */ - int rawChan; /* Unformated echange channel */ + int measChan; /* Unformated echange channel for performance measurement*/ xbt_dynar_t sockets; /* all sockets known to this process */ } s_gras_trp_procdata_t,*gras_trp_procdata_t; diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c index 8e1e0ccbf5..0123d216a7 100644 --- a/src/gras/Transport/transport_plugin_sg.c +++ b/src/gras/Transport/transport_plugin_sg.c @@ -120,14 +120,14 @@ xbt_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, sock->peer_name,sock->peer_port); } - if (pr.raw && !sock->raw) { + if (pr.meas && !sock->meas) { RAISE2(mismatch_error, "can't connect to %s:%d in regular mode, the process listen " - "in raw mode on this port",sock->peer_name,sock->peer_port); + "in meas mode on this port",sock->peer_name,sock->peer_port); } - if (!pr.raw && sock->raw) { + if (!pr.meas && sock->meas) { RAISE2(mismatch_error, - "can't connect to %s:%d in raw mode, the process listen " + "can't connect to %s:%d in meas mode, the process listen " "in regular mode on this port",sock->peer_name,sock->peer_port); } @@ -143,7 +143,7 @@ xbt_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self, 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", + sock->meas?"meas":"regular", sock->peer_name,sock->peer_port,data->to_PID); return no_error; @@ -174,9 +174,9 @@ xbt_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, break; case mismatch_error: /* Port not used so far. Do it */ - pr.tochan = sock->raw ? pd->rawChan : pd->chan; + pr.tochan = sock->meas ? pd->measChan : pd->chan; pr.port = sock->port; - pr.raw = sock->raw; + pr.meas = sock->meas; xbt_dynar_push(hd->ports,&pr); break; @@ -195,7 +195,7 @@ xbt_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self, VERB6("'%s' (%d) ears on %s:%d%s (%p)", MSG_process_get_name(MSG_process_self()), MSG_process_self_PID(), - host,sock->port,sock->raw? " (mode RAW)":"",sock); + host,sock->port,sock->meas? " (mode meas)":"",sock); return no_error; } @@ -275,7 +275,7 @@ xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sock, 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) + if (MSG_task_get(&task, (sock->meas ? pd->measChan : pd->chan)) != MSG_OK) RAISE0(unknown_error,"Error in MSG_task_get()"); DEBUG1("Got chuck %s",MSG_task_get_name(task)); @@ -307,8 +307,9 @@ xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sock, return no_error; } -/* Data exchange over raw sockets */ -xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, +#if 0 +/* Data exchange over measurement sockets */ +xbt_error_t gras_socket_meas_exchange(gras_socket_t peer, int sender, unsigned int timeout, unsigned long int expSize, @@ -328,11 +329,11 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, if (sender) { - sprintf(name,"Raw data[%d]",count++); + sprintf(name,"meas 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", + DEBUG5("%f:%s: gras_socket_meas_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); @@ -340,7 +341,7 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, 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", + DEBUG5("%f:%s: gras_socket_meas_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); @@ -348,11 +349,11 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, } else { /* we are receiver, simulate a select */ task=NULL; - DEBUG2("%f:%s: gras_socket_raw_recv() BEGIN\n", + DEBUG2("%f:%s: gras_socket_meas_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) { + if (MSG_task_Iprobe((m_channel_t) pd->measChan)) { + if (MSG_task_get(&task, (m_channel_t) pd->measChan) != MSG_OK) { fprintf(stderr,"GRAS: Error in MSG_task_get()\n"); return unknown_error; } @@ -362,7 +363,7 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, return unknown_error; } - DEBUG2("%f:%s: gras_socket_raw_recv() END\n", + DEBUG2("%f:%s: gras_socket_meas_recv() END\n", gras_os_time(), MSG_process_get_name(MSG_process_self())); break; } else { @@ -378,3 +379,4 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, return no_error; } +#endif diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c index 00994e046e..dd855f9b8b 100644 --- a/src/gras/Transport/transport_plugin_tcp.c +++ b/src/gras/Transport/transport_plugin_tcp.c @@ -49,7 +49,7 @@ static int TcpProtoNumber(void); typedef struct { fd_set msg_socks; - fd_set raw_socks; + fd_set meas_socks; } gras_trp_tcp_plug_data_t; /*** @@ -69,7 +69,7 @@ xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) { gras_trp_tcp_plug_data_t *data = xbt_new(gras_trp_tcp_plug_data_t,1); FD_ZERO(&(data->msg_socks)); - FD_ZERO(&(data->raw_socks)); + FD_ZERO(&(data->meas_socks)); plug->socket_client = gras_trp_tcp_socket_client; plug->socket_server = gras_trp_tcp_socket_server; @@ -182,8 +182,8 @@ xbt_error_t gras_trp_tcp_socket_server(gras_trp_plugin_t *self, RAISE2(system_error,"Cannot listen to port %d: %s",sock->port,sock_errstr); } - if (sock->raw) - FD_SET(sock->sd, &(tcp->raw_socks)); + if (sock->meas) + FD_SET(sock->sd, &(tcp->meas_socks)); else FD_SET(sock->sd, &(tcp->msg_socks)); @@ -292,8 +292,8 @@ void gras_trp_tcp_socket_close(gras_socket_t sock){ /* forget about the socket ... but not when using winsock since accept'ed socket can not fit into the fd_set*/ - if (sock->raw){ - FD_CLR(sock->sd, &(tcp->raw_socks)); + if (sock->meas){ + FD_CLR(sock->sd, &(tcp->meas_socks)); } else { FD_CLR(sock->sd, &(tcp->msg_socks)); } @@ -398,12 +398,13 @@ static int TcpProtoNumber(void) { return returnValue; } -/* Data exchange over raw sockets. Placing this in there is a kind of crude hack. - It means that the only possible raw are TCP where we may want to do UDP for them. +#if 0 /* KILLME */ +/* Data exchange over measurement sockets. Placing this in there is a kind of crude hack. + It means that the only possible measurement sockets are TCP where we may want to do UDP for them. But I fail to find a good internal organization for now. We may want to split - raw and regular sockets more efficiently. + meas and regular sockets more efficiently. */ -xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, +xbt_error_t gras_socket_meas_exchange(gras_socket_t peer, int sender, unsigned int timeout, unsigned long int exp_size, @@ -445,7 +446,7 @@ xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, free(chunk); return no_error; } - +#endif #ifdef HAVE_WINSOCK_H #define RETSTR( x ) case x: return #x diff --git a/src/gras/Transport/transport_private.h b/src/gras/Transport/transport_private.h index f08157228a..b578cd3ae3 100644 --- a/src/gras/Transport/transport_private.h +++ b/src/gras/Transport/transport_private.h @@ -39,7 +39,7 @@ typedef struct s_gras_socket { int incoming :1; /* true if we can read from this sock */ int outgoing :1; /* true if we can write on this sock */ int accepting :1; /* true if master incoming sock in tcp */ - int raw :1; /* true if this is an experiment socket instead of messaging */ + int meas :1; /* true if this is an experiment socket instead of messaging */ unsigned long int bufSize; /* what to say to the OS. field here to remember it when accepting */ @@ -86,8 +86,8 @@ xbt_error_t gras_trp_buf_setup(gras_trp_plugin_t *plug); void gras_trp_buf_init_sock(gras_socket_t sock); -/* Data exchange over raw sockets */ -xbt_error_t gras_socket_raw_exchange(gras_socket_t peer, +/* Data exchange over measurement sockets */ /* FIXME: KILLME */ +xbt_error_t gras_socket_meas_exchange(gras_socket_t peer, int sender, unsigned int timeout, unsigned long int expSize, diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c index 018225fece..1b3790bac3 100644 --- a/src/gras/Virtu/sg_process.c +++ b/src/gras/Virtu/sg_process.c @@ -21,7 +21,7 @@ gras_process_init() { gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self()); gras_procdata_t *pd=xbt_new(gras_procdata_t,1); gras_trp_procdata_t trp_pd; - gras_sg_portrec_t prraw,pr; + gras_sg_portrec_t prmeas,pr; int i; if (MSG_process_set_data(MSG_process_self(),(void*)pd) != MSG_OK) @@ -54,25 +54,25 @@ gras_process_init() { /* regiter it to the ports structure */ pr.port = -1; pr.tochan = i; - pr.raw = 0; + pr.meas = 0; xbt_dynar_push(hd->ports,&pr); - /* take a free RAW channel for this process */ + /* take a free meas channel for this process */ for (i=0; iproc[i]; i++); if (i == XBT_MAX_CHANNEL) { RAISE2(system_error, "GRAS: Can't add a new process on %s, because all channel are already in use. Please increase MAX CHANNEL (which is %d for now) and recompile GRAS\n.", MSG_host_get_name(MSG_host_self()),XBT_MAX_CHANNEL); } - trp_pd->rawChan = i; + trp_pd->measChan = i; hd->proc[ i ] = MSG_process_self_PID(); /* register it to the ports structure */ - prraw.port = -1; - prraw.tochan = i; - prraw.raw = 1; - xbt_dynar_push(hd->ports,&prraw); + prmeas.port = -1; + prmeas.tochan = i; + prmeas.meas = 1; + xbt_dynar_push(hd->ports,&prmeas); VERB2("Creating process '%s' (%d)", MSG_process_get_name(MSG_process_self()), @@ -103,7 +103,7 @@ gras_process_exit() { hd->proc[cpt] = 0; xbt_dynar_foreach(hd->ports, cpt, pr) { - if (pr.port == trp_pd->chan || pr.port == trp_pd->rawChan) { + if (pr.port == trp_pd->chan || pr.port == trp_pd->measChan) { xbt_dynar_cursor_rm(hd->ports, &cpt); } } diff --git a/src/gras/Virtu/virtu_sg.h b/src/gras/Virtu/virtu_sg.h index 45ffaad804..4df4e09aeb 100644 --- a/src/gras/Virtu/virtu_sg.h +++ b/src/gras/Virtu/virtu_sg.h @@ -18,7 +18,7 @@ typedef struct { int port; /* list of ports used by a server socket */ int tochan; /* the channel it points to */ - int raw; /* (boolean) the channel is in raw mode or for messages */ + int meas; /* (boolean) the channel is for measurements or for messages */ } gras_sg_portrec_t; /* Data for each host */ -- 2.20.1