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
[simgrid.git]
/
src
/
surf
/
network_ib.cpp
diff --git
a/src/surf/network_ib.cpp
b/src/surf/network_ib.cpp
index
dce8789
..
d00e88c
100644
(file)
--- a/
src/surf/network_ib.cpp
+++ b/
src/surf/network_ib.cpp
@@
-6,11
+6,11
@@
#include <utility>
#include <utility>
-#include "network_ib.hpp"
-
-#include "src/surf/HostImpl.hpp"
#include "simgrid/sg_config.h"
#include "simgrid/sg_config.h"
-#include "maxmin_private.hpp"
+#include "src/surf/HostImpl.hpp"
+#include "src/surf/maxmin_private.hpp"
+#include "src/surf/network_ib.hpp"
+#include "src/surf/xml/platf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
@@
-26,9
+26,7
@@
static void IB_create_host_callback(simgrid::s4u::Host& host){
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(
@@
-54,12
+52,10
@@
static void IB_action_init_callback(simgrid::surf::NetworkAction* action, simgri
{
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().c_str());
+ simgrid::surf::IBNode* act_src = (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, src->cname());
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().c_str());
+ simgrid::surf::IBNode* act_dst = (simgrid::surf::IBNode*)xbt_dict_get_or_null(ibModel->active_nodes, dst->cname());
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);
@@
-97,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 {