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
Added round trip time contraint to the SDP program, this parameter
[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
1715312
..
e11b116
100644
(file)
--- a/
src/gras/Transport/sg_transport.c
+++ b/
src/gras/Transport/sg_transport.c
@@
-12,8
+12,10
@@
#include "msg/msg.h"
#include "gras/Virtu/virtu_sg.h"
#include "msg/msg.h"
#include "gras/Virtu/virtu_sg.h"
-XBT_LOG_EXTERNAL_CATEGORY(transport);
-XBT_LOG_DEFAULT_CATEGORY(transport);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_trp);
+
+/* check transport_private.h for an explanation of this variable; this just need to be defined to NULL in SG */
+gras_socket_t _gras_lastly_selected_socket = NULL;
/**
* gras_trp_select:
/**
* gras_trp_select:
@@
-82,7
+84,7
@@
gras_socket_t gras_trp_select(double timeout) {
res->accepting = 0;
res->sd = -1;
res->accepting = 0;
res->sd = -1;
- res->port
= -1;
+ res->port = -1;
sockdata = xbt_new(gras_trp_sg_sock_data_t,1);
sockdata->from_PID = MSG_process_self_PID();
sockdata = xbt_new(gras_trp_sg_sock_data_t,1);
sockdata->from_PID = MSG_process_self_PID();
@@
-90,7
+92,7
@@
gras_socket_t gras_trp_select(double timeout) {
sockdata->to_host = MSG_process_get_host(MSG_process_from_PID(r_pid));
res->data = sockdata;
gras_trp_buf_init_sock(res);
sockdata->to_host = MSG_process_get_host(MSG_process_from_PID(r_pid));
res->data = sockdata;
gras_trp_buf_init_sock(res);
-
+
res->peer_name = strdup(MSG_host_get_name(sockdata->to_host));
remote_hd=(gras_hostdata_t *)MSG_host_get_data(sockdata->to_host);
res->peer_name = strdup(MSG_host_get_name(sockdata->to_host));
remote_hd=(gras_hostdata_t *)MSG_host_get_data(sockdata->to_host);
@@
-128,6
+130,7
@@
gras_socket_t gras_trp_select(double timeout) {
}
}
}
}
}
}
+ res->peer_port = ((gras_trp_procdata_t) gras_libdata_by_name_from_remote("gras_trp",MSG_process_from_PID(r_pid)))->myport;
xbt_assert0(sockdata->to_chan != -1,
"Got a message from a process without channel");
xbt_assert0(sockdata->to_chan != -1,
"Got a message from a process without channel");