A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
on exit, close all the sockets left open and others leak plugs
[simgrid.git]
/
src
/
gras
/
Transport
/
transport.c
diff --git
a/src/gras/Transport/transport.c
b/src/gras/Transport/transport.c
index
a1788a2
..
a04078b
100644
(file)
--- 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");
#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 */
static short int _gras_trp_started = 0;
static xbt_dict_t _gras_trp_plugins; /* All registered plugins */
@@
-31,8
+31,8
@@
gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
switch (errcode) {
case mismatch_error:
/* SG plugin return mismatch when in RL mode (and vice versa) */
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:
break;
case no_error:
@@
-52,7
+52,7
@@
void gras_trp_init(void){
_gras_trp_plugins=xbt_dict_new();
#ifdef HAVE_WINSOCK2_H
_gras_trp_plugins=xbt_dict_new();
#ifdef HAVE_WINSOCK2_H
- /* initialize the windows mecanism */
+ /* initialize the windows mec
h
anism */
{
WORD wVersionRequested;
WSADATA wsaData;
{
WORD wVersionRequested;
WSADATA wsaData;
@@
-94,6
+94,10
@@
void gras_trp_init(void){
void
gras_trp_exit(void){
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;
}
if (_gras_trp_started == 0) {
return;
}
@@
-108,6
+112,14
@@
gras_trp_exit(void){
}
#endif
}
#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);
}
}
xbt_dict_free(&_gras_trp_plugins);
}
}
@@
-121,11
+133,11
@@
void gras_trp_plugin_free(void *p) {
plug->exit(plug);
} else if (plug->data) {
DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name);
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);
}
}
}
}
@@
-153,7
+165,7
@@
void gras_trp_socket_new(int incoming,
sock->port = -1;
sock->peer_port = -1;
sock->peer_name = NULL;
sock->port = -1;
sock->peer_port = -1;
sock->peer_name = NULL;
- sock->
raw
= 0;
+ sock->
meas
= 0;
*dst = sock;
*dst = sock;
@@
-172,7
+184,7
@@
xbt_error_t
gras_socket_server_ext(unsigned short port,
unsigned long int bufSize,
gras_socket_server_ext(unsigned short port,
unsigned long int bufSize,
- int
raw
,
+ int
measurement
,
/* OUT */ gras_socket_t *dst) {
/* OUT */ gras_socket_t *dst) {
@@
-192,7
+204,7
@@
gras_socket_server_ext(unsigned short port,
sock->plugin= trp;
sock->port=port;
sock->bufSize = bufSize;
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);
/* Call plugin socket creation function */
DEBUG1("Prepare socket with plugin (fct=%p)",trp->socket_server);
@@
-203,7
+215,7
@@
gras_socket_server_ext(unsigned short port,
sock->accepting?'y':'n');
if (errcode != no_error) {
sock->accepting?'y':'n');
if (errcode != no_error) {
-
xbt_
free(sock);
+ free(sock);
return errcode;
}
return errcode;
}
@@
-223,7
+235,7
@@
gras_socket_client_ext(const char *host,
unsigned short port,
unsigned long int bufSize,
unsigned short port,
unsigned long int bufSize,
- int
raw
,
+ int
meas
,
/* OUT */ gras_socket_t *dst) {
/* OUT */ gras_socket_t *dst) {
@@
-242,7
+254,7
@@
gras_socket_client_ext(const char *host,
sock->peer_port = port;
sock->peer_name = (char*)strdup(host?host:"localhost");
sock->bufSize = bufSize;
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);
/* plugin-specific */
errcode= (*trp->socket_client)(trp, sock);
@@
-252,7
+264,7
@@
gras_socket_client_ext(const char *host,
sock->accepting?'y':'n');
if (errcode != no_error) {
sock->accepting?'y':'n');
if (errcode != no_error) {
-
xbt_
free(sock);
+ free(sock);
return errcode;
}
return errcode;
}
@@
-292,6
+304,7
@@
void gras_socket_close(gras_socket_t sock) {
gras_socket_t sock_iter;
int cursor;
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) {
/* FIXME: Issue an event when the socket is closed */
if (sock) {
xbt_dynar_foreach(sockets,cursor,sock_iter) {
@@
-302,13
+315,15
@@
void gras_socket_close(gras_socket_t sock) {
/* free the memory */
if (sock->peer_name)
/* free the memory */
if (sock->peer_name)
- xbt_free(sock->peer_name);
- xbt_free(sock);
+ free(sock->peer_name);
+ free(sock);
+ XBT_OUT;
return;
}
}
return;
}
}
- WARN
0("Ignoring request to free an unknown socket"
);
+ WARN
1("Ignoring request to free an unknown socket (%p)",sock
);
}
}
+ XBT_OUT;
}
/**
}
/**
@@
-372,7
+387,7
@@
char *gras_socket_peer_name(gras_socket_t sock) {
return sock->peer_name;
}
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) {
unsigned int timeout,
unsigned long int exp_size,
unsigned long int msg_size) {
@@
-380,22
+395,24
@@
xbt_error_t gras_socket_raw_send(gras_socket_t peer,
char *chunk = xbt_malloc(msg_size);
int exp_sofar;
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) {
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));
}
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));
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){
unsigned int timeout,
unsigned long int exp_size,
unsigned long int msg_size){
@@
-404,19
+421,21
@@
xbt_error_t gras_socket_raw_recv(gras_socket_t peer,
char *chunk = xbt_malloc(msg_size);
int exp_sofar;
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) {
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));
}
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));
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); */
}
/*
}
/*
@@
-437,6
+456,7
@@
static void gras_trp_procdata_free(void *data) {
gras_trp_procdata_t res = (gras_trp_procdata_t)data;
xbt_dynar_free(&( res->sockets ));
gras_trp_procdata_t res = (gras_trp_procdata_t)data;
xbt_dynar_free(&( res->sockets ));
+ free(res);
}
/*
}
/*