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
Kill "if" before free, and useless cast of free argument.
[simgrid.git]
/
src
/
gras
/
Transport
/
sg_transport.c
diff --git
a/src/gras/Transport/sg_transport.c
b/src/gras/Transport/sg_transport.c
index
83586d2
..
276501a
100644
(file)
--- a/
src/gras/Transport/sg_transport.c
+++ b/
src/gras/Transport/sg_transport.c
@@
-32,7
+32,7
@@
gras_socket_t gras_trp_select(double timeout)
{
gras_socket_t res;
gras_trp_procdata_t pd =
- (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
+
(gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
gras_trp_sg_sock_data_t *sockdata;
gras_trp_plugin_t trp;
gras_socket_t active_socket = NULL;
@@
-40,9
+40,9
@@
gras_socket_t gras_trp_select(double timeout)
gras_socket_t sock_iter; /* iterating over all sockets */
unsigned int cursor;
-
DEBUG3
("select on %s@%s with timeout=%f",
- SIMIX_process_
get_name(SIMIX_process_self()
),
- SIMIX_host_
get_name(SIMIX_host_self()
), timeout);
+
XBT_DEBUG
("select on %s@%s with timeout=%f",
+ SIMIX_process_
self_get_name(
),
+ SIMIX_host_
self_get_name(
), timeout);
if (timeout >= 0) {
xbt_queue_shift_timed(pd->msg_selectable_sockets,
&active_socket, timeout);
@@
-51,18
+51,18
@@
gras_socket_t gras_trp_select(double timeout)
}
if (active_socket == NULL) {
-
DEBUG0
("TIMEOUT");
- THROW
0
(timeout_error, 0, "Timeout");
+
XBT_DEBUG
("TIMEOUT");
+ THROW
F
(timeout_error, 0, "Timeout");
}
active_socket_data = (gras_trp_sg_sock_data_t *) active_socket->data;
/* Ok, got something. Open a socket back to the expeditor */
/* Try to reuse an already openned socket to that expeditor */
-
DEBUG1
("Open sockets size %lu", xbt_dynar_length(pd->sockets));
+
XBT_DEBUG
("Open sockets size %lu", xbt_dynar_length(pd->sockets));
xbt_dynar_foreach(pd->sockets, cursor, sock_iter) {
gras_trp_sg_sock_data_t *sock_data;
-
DEBUG1
("Consider %p as outgoing socket to expeditor", sock_iter);
+
XBT_DEBUG
("Consider %p as outgoing socket to expeditor", sock_iter);
if (sock_iter->meas || !sock_iter->outgoing)
continue;
@@
-70,14
+70,14
@@
gras_socket_t gras_trp_select(double timeout)
if ((sock_data->to_socket == active_socket) &&
(sock_data->to_host ==
- SIMIX_process_get_host(active_socket_data->from_process))) {
+ SIMIX_
req_
process_get_host(active_socket_data->from_process))) {
xbt_dynar_cursor_unlock(pd->sockets);
return sock_iter;
}
}
/* Socket to expeditor not created yet */
-
DEBUG0
("Create a socket to the expeditor");
+
XBT_DEBUG
("Create a socket to the expeditor");
trp = gras_trp_plugin_get_by_name("sg");
@@
-103,25
+103,25
@@
gras_socket_t gras_trp_select(double timeout)
res->peer_port = ((gras_trp_procdata_t)
gras_libdata_by_name_from_remote("gras_trp",
sockdata->to_process))->
- myport;
+
myport;
sockdata->to_socket = active_socket;
/*update the peer to_socket variable */
active_socket_data->to_socket = res;
- sockdata->cond = SIMIX_cond_init();
- sockdata->mutex = SIMIX_mutex_init();
+ sockdata->cond = SIMIX_
req_
cond_init();
+ sockdata->mutex = SIMIX_
req_
mutex_init();
sockdata->to_host =
-
SIMIX
_process_get_host(active_socket_data->from_process);
+
SIMIX_req
_process_get_host(active_socket_data->from_process);
res->data = sockdata;
- res->peer_name = strdup(SIMIX_host_get_name(sockdata->to_host));
+ res->peer_name = strdup(SIMIX_
req_
host_get_name(sockdata->to_host));
gras_trp_buf_init_sock(res);
-
DEBUG4
("Create socket to process:%s(Port %d) from process: %s(Port %d)",
- SIMIX_process_get_name(sockdata->from_process),
+
XBT_DEBUG
("Create socket to process:%s(Port %d) from process: %s(Port %d)",
+ SIMIX_
req_
process_get_name(sockdata->from_process),
res->peer_port,
- SIMIX_process_get_name(sockdata->to_process), res->port);
+ SIMIX_
req_
process_get_name(sockdata->to_process), res->port);
return res;
}
@@
-131,17
+131,17
@@
gras_socket_t gras_trp_select(double timeout)
void gras_trp_tcp_setup(gras_trp_plugin_t plug)
{
- THROW
0(mismatch_error, 0, NULL
);
+ THROW
(mismatch_error, 0
);
}
void gras_trp_file_setup(gras_trp_plugin_t plug)
{
- THROW
0(mismatch_error, 0, NULL
);
+ THROW
(mismatch_error, 0
);
}
void gras_trp_iov_setup(gras_trp_plugin_t plug)
{
- THROW
0(mismatch_error, 0, NULL
);
+ THROW
(mismatch_error, 0
);
}
gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock)