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 models getName() call sites.
[simgrid.git]
/
src
/
surf
/
network_ib.cpp
diff --git
a/src/surf/network_ib.cpp
b/src/surf/network_ib.cpp
index
de303c9
..
cecdfc8
100644
(file)
--- a/
src/surf/network_ib.cpp
+++ b/
src/surf/network_ib.cpp
@@
-24,7
+24,7
@@
static void IB_create_host_callback(sg_platf_host_cbarg_t t){
}
}
-static void IB_action_state_changed_callback(NetworkAction
Ptr
action, e_surf_action_state_t statein, e_surf_action_state_t stateout){
+static void IB_action_state_changed_callback(NetworkAction
*
action, e_surf_action_state_t statein, e_surf_action_state_t stateout){
if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
return;
std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
return;
std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
@@
-37,7
+37,7
@@
static void IB_action_state_changed_callback(NetworkActionPtr action, e_surf_act
}
}
-static void IB_action_init_callback(NetworkAction
Ptr action,RoutingEdgePtr src, RoutingEdgePtr
dst, double size, double rate){
+static void IB_action_init_callback(NetworkAction
*action,RoutingEdge *src, RoutingEdge *
dst, double size, double rate){
if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL)
xbt_die("IB comm added, without any node connected !");
if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL)
xbt_die("IB comm added, without any node connected !");
@@
-51,7
+51,7
@@
static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src,
xbt_die("could not find dst node active comms !");
// act_dst->rate=rate;
xbt_die("could not find dst node active comms !");
// act_dst->rate=rate;
- ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair
<IBNode*,IBNode*>
(act_src, act_dst);
+ ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair(act_src, act_dst);
//post the action in the second dist, to retrieve in the other callback
XBT_DEBUG("IB callback - action %p init", action);
//post the action in the second dist, to retrieve in the other callback
XBT_DEBUG("IB callback - action %p init", action);
@@
-184,7
+184,7
@@
void NetworkIBModel::updateIBfactors_rec(IBNode *root, bool* updatedlist) {
}
}
-void NetworkIBModel::updateIBfactors(NetworkAction
Ptr
action, IBNode *from, IBNode * to, int remove) {
+void NetworkIBModel::updateIBfactors(NetworkAction
*
action, IBNode *from, IBNode * to, int remove) {
if (from == to)//disregard local comms (should use loopback)
return;
if (from == to)//disregard local comms (should use loopback)
return;