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
more minor smells removed
[simgrid.git]
/
src
/
surf
/
network_ib.cpp
diff --git
a/src/surf/network_ib.cpp
b/src/surf/network_ib.cpp
index
6b199b8
..
41fa93c
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);
@@
-21,24
+21,20
@@
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(
- simgrid::surf::NetworkAction *action,
- simgrid::surf::Action::State statein, simgrid::surf::Action::State stateout)
+static void IB_action_state_changed_callback(simgrid::surf::NetworkAction* action)
{
using simgrid::surf::NetworkIBModel;
using simgrid::surf::IBNode;
{
using simgrid::surf::NetworkIBModel;
using simgrid::surf::IBNode;
- if
(statein!=simgrid::surf::Action::State::running || stateout!=
simgrid::surf::Action::State::done)
+ if
(action->getState() !=
simgrid::surf::Action::State::done)
return;
std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
XBT_DEBUG("IB callback - action %p finished", action);
return;
std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
XBT_DEBUG("IB callback - action %p finished", action);
@@
-49,16
+45,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);
@@
-80,24
+75,20
@@
static void IB_action_init_callback(
/* month=june, */
/* year={2010} */
/* } */
/* month=june, */
/* year={2010} */
/* } */
-void surf_network_model_init_IB(
void
)
+void surf_network_model_init_IB()
{
{
- using simgrid::surf::networkActionStateChangedCallbacks;
-
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkIBModel();
if (surf_network_model)
return;
surf_network_model = new simgrid::surf::NetworkIBModel();
-
xbt_dynar_push(all_existing_models, &
surf_network_model);
-
networkActionStateChangedCallbacks
.connect(IB_action_state_changed_callback);
- Link::onCommunicate.connect(IB_action_init_callback);
+
all_existing_models->push_back(
surf_network_model);
+
simgrid::s4u::Link::onCommunicationStateChange
.connect(IB_action_state_changed_callback);
+
simgrid::s4u::
Link::onCommunicate.connect(IB_action_init_callback);
simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
xbt_cfg_setdefault_double("network/weight-S", 8775);
}
simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
xbt_cfg_setdefault_double("network/weight-S", 8775);
}
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {