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
cosmetics: .name().c_str() becomes .cname()
[simgrid.git]
/
src
/
surf
/
network_ib.cpp
diff --git
a/src/surf/network_ib.cpp
b/src/surf/network_ib.cpp
index
2dd9bc4
..
30d8f4a
100644
(file)
--- a/
src/surf/network_ib.cpp
+++ b/
src/surf/network_ib.cpp
@@
-21,14
+21,12
@@
static void IB_create_host_callback(simgrid::s4u::Host& host){
static int id=0;
// pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
if(((NetworkIBModel*)surf_network_model)->active_nodes==nullptr)
static int id=0;
// pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
if(((NetworkIBModel*)surf_network_model)->active_nodes==nullptr)
- ((NetworkIBModel*)surf_network_model)->active_nodes
=xbt_dict_new(
);
+ ((NetworkIBModel*)surf_network_model)->active_nodes
= xbt_dict_new_homogeneous(nullptr
);
IBNode* act = new IBNode(id);
id++;
IBNode* act = new IBNode(id);
id++;
- xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes,
- host.name().c_str(), act, nullptr);
-
+ xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, host.cname(), act, nullptr);
}
static void IB_action_state_changed_callback(
}
static void IB_action_state_changed_callback(
@@
-49,16
+47,15
@@
static void IB_action_state_changed_callback(
}
}
-
-static void IB_action_init_callback(
- simgrid::surf::NetworkAction *action, simgrid::kernel::routing::NetCard *src, simgrid::kernel::routing::NetCard *dst)
+static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgrid::s4u::Host* src,
+ simgrid::s4u::Host* dst)
{
simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model;
{
simgrid::surf::NetworkIBModel* ibModel = (simgrid::surf::NetworkIBModel*)surf_network_model;
- simgrid::surf::IBNode* act_src
= (simgrid::surf::IBNode*) xbt_dict_get_or_null(ibModel->active_nodes, src->
name());
+ simgrid::surf::IBNode* act_src
= (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, src->c
name());
xbt_assert(act_src, "could not find src node active comms !");
xbt_assert(act_src, "could not find src node active comms !");
- simgrid::surf::IBNode* act_dst
= (simgrid::surf::IBNode*) xbt_dict_get_or_null(ibModel->active_nodes, dst->
name());
+ simgrid::surf::IBNode* act_dst
= (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, dst->c
name());
xbt_assert(act_dst, "could not find dst node active comms !");
ibModel->active_comms[action]=std::make_pair(act_src, act_dst);
xbt_assert(act_dst, "could not find dst node active comms !");
ibModel->active_comms[action]=std::make_pair(act_src, act_dst);
@@
-88,7
+85,7
@@
void surf_network_model_init_IB()
return;
surf_network_model = new simgrid::surf::NetworkIBModel();
return;
surf_network_model = new simgrid::surf::NetworkIBModel();
-
xbt_dynar_push(all_existing_models, &
surf_network_model);
+
all_existing_models->push_back(
surf_network_model);
networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
Link::onCommunicate.connect(IB_action_init_callback);
simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
Link::onCommunicate.connect(IB_action_init_callback);
simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
@@
-96,8
+93,6
@@
void surf_network_model_init_IB()
}
}
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {