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
Some more work to do
[simgrid.git]
/
src
/
gras
/
Transport
/
transport.c
diff --git
a/src/gras/Transport/transport.c
b/src/gras/Transport/transport.c
index
a1788a2
..
6cb3f1e
100644
(file)
--- a/
src/gras/Transport/transport.c
+++ b/
src/gras/Transport/transport.c
@@
-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;
@@
-121,11
+121,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);
}
}
}
}
@@
-203,7
+203,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;
}
@@
-252,7
+252,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
+292,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
+303,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;
}
}
WARN0("Ignoring request to free an unknown socket");
}
return;
}
}
WARN0("Ignoring request to free an unknown socket");
}
+ XBT_OUT;
}
/**
}
/**
@@
-391,7
+394,7
@@
xbt_error_t gras_socket_raw_send(gras_socket_t peer,
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);
+ free(chunk);
return no_error;/* gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize); */
}
return no_error;/* gras_socket_raw_exchange(peer,1,timeout,expSize,msgSize); */
}
@@
-415,7
+418,7
@@
xbt_error_t gras_socket_raw_recv(gras_socket_t peer,
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);
+ free(chunk);
return no_error;/* gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize); */
}
return no_error;/* gras_socket_raw_exchange(peer,0,timeout,expSize,msgSize); */
}