#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 */
switch (errcode) {
case mismatch_error:
/* SG plugin return mismatch when in RL mode (and vice versa) */
- xbt_free(plug->name);
- xbt_free(plug);
+ free(plug->name);
+ free(plug);
break;
case no_error:
_gras_trp_plugins=xbt_dict_new();
#ifdef HAVE_WINSOCK2_H
- /* initialize the windows mecanism */
+ /* initialize the windows mechanism */
{
WORD wVersionRequested;
WSADATA wsaData;
void
gras_trp_exit(void){
+ xbt_dynar_t sockets = gras_socketset_get();
+ gras_socket_t sock_iter;
+ int cursor;
+
if (_gras_trp_started == 0) {
return;
}
}
#endif
+ /* Close all the sockets */
+ xbt_dynar_foreach(sockets,cursor,sock_iter) {
+ VERB1("Closing the socket %p left open on exit. Maybe a socket leak?",
+ sock_iter);
+ gras_socket_close(sock_iter);
+ }
+
+ /* Delete the plugins */
xbt_dict_free(&_gras_trp_plugins);
}
}
plug->exit(plug);
} else if (plug->data) {
DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name);
- xbt_free(plug->data);
+ free(plug->data);
}
- xbt_free(plug->name);
- xbt_free(plug);
+ free(plug->name);
+ free(plug);
}
}
sock->port = -1;
sock->peer_port = -1;
sock->peer_name = NULL;
- sock->raw = 0;
+ sock->meas = 0;
*dst = sock;
gras_socket_server_ext(unsigned short port,
unsigned long int bufSize,
- int raw,
+ int measurement,
/* OUT */ gras_socket_t *dst) {
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);
sock->accepting?'y':'n');
if (errcode != no_error) {
- xbt_free(sock);
+ free(sock);
return errcode;
}
unsigned short port,
unsigned long int bufSize,
- int raw,
+ int meas,
/* OUT */ gras_socket_t *dst) {
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);
sock->accepting?'y':'n');
if (errcode != no_error) {
- xbt_free(sock);
+ free(sock);
return errcode;
}
gras_socket_t sock_iter;
int cursor;
+ XBT_IN;
/* FIXME: Issue an event when the socket is closed */
if (sock) {
xbt_dynar_foreach(sockets,cursor,sock_iter) {
/* free the memory */
if (sock->peer_name)
- xbt_free(sock->peer_name);
- xbt_free(sock);
+ free(sock->peer_name);
+ free(sock);
+ XBT_OUT;
return;
}
}
- WARN0("Ignoring request to free an unknown socket");
+ WARN1("Ignoring request to free an unknown socket (%p)",sock);
}
+ XBT_OUT;
}
/**
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) {
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));
- xbt_free(chunk);
- return no_error;/* gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize); */
+ free(chunk);
+ 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){
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));
- xbt_free(chunk);
- return no_error;/* gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize); */
+ free(chunk);
+ XBT_OUT;
+ return no_error;/* gras_socket_meas_exchange(peer,0,timeout,expSize,msgSize); */
}
/*
gras_trp_procdata_t res = (gras_trp_procdata_t)data;
xbt_dynar_free(&( res->sockets ));
+ free(res);
}
/*