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
dynar--
[simgrid.git]
/
src
/
surf
/
network_ib.cpp
diff --git
a/src/surf/network_ib.cpp
b/src/surf/network_ib.cpp
index
ff2211b
..
41fa93c
100644
(file)
--- a/
src/surf/network_ib.cpp
+++ b/
src/surf/network_ib.cpp
@@
-4,39
+4,37
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include <algorithm>
#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);
static void IB_create_host_callback(simgrid::s4u::Host& host){
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
static void IB_create_host_callback(simgrid::s4u::Host& host){
- using namespace simgrid::surf;
+ using simgrid::surf::NetworkIBModel;
+ using simgrid::surf::IBNode;
static int id=0;
// pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
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==
NULL
)
- ((NetworkIBModel*)surf_network_model)->active_nodes
=xbt_dict_new(
);
+ if(((NetworkIBModel*)surf_network_model)->active_nodes==
nullptr
)
+ ((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, NULL);
-
+ 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 namespace simgrid::surf;
- if(statein!=simgrid::surf::Action::State::running || stateout!=simgrid::surf::Action::State::done)
+ using simgrid::surf::NetworkIBModel;
+ using simgrid::surf::IBNode;
+
+ 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);
@@
-47,16
+45,15
@@
static void IB_action_state_changed_callback(
}
}
-
-static void IB_action_init_callback(
- simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::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);
@@
-78,31
+75,27
@@
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 {
NetworkIBModel::NetworkIBModel()
: NetworkSmpiModel() {
haveGap_=false;
namespace simgrid {
namespace surf {
NetworkIBModel::NetworkIBModel()
: NetworkSmpiModel() {
haveGap_=false;
- active_nodes=
NULL
;
+ active_nodes=
nullptr
;
const char* IB_factors_string=xbt_cfg_get_string("smpi/IB-penalty-factors");
xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";");
const char* IB_factors_string=xbt_cfg_get_string("smpi/IB-penalty-factors");
xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";");
@@
-119,9
+112,9
@@
namespace simgrid {
NetworkIBModel::~NetworkIBModel()
{
NetworkIBModel::~NetworkIBModel()
{
- xbt_dict_cursor_t cursor =
NULL
;
- IBNode* instance =
NULL
;
- char *name =
NULL
;
+ xbt_dict_cursor_t cursor =
nullptr
;
+ IBNode* instance =
nullptr
;
+ char *name =
nullptr
;
xbt_dict_foreach(active_nodes, cursor, name, instance)
delete instance;
xbt_dict_free(&active_nodes);
xbt_dict_foreach(active_nodes, cursor, name, instance)
delete instance;
xbt_dict_free(&active_nodes);
@@
-197,7
+190,7
@@
namespace simgrid {
return;
bool* updated=(bool*)xbt_malloc0(xbt_dict_size(active_nodes)*sizeof(bool));
return;
bool* updated=(bool*)xbt_malloc0(xbt_dict_size(active_nodes)*sizeof(bool));
- ActiveComm* comm=
NULL
;
+ ActiveComm* comm=
nullptr
;
if(remove){
if(to->ActiveCommsDown[from]==1)
to->ActiveCommsDown.erase(from);
if(remove){
if(to->ActiveCommsDown[from]==1)
to->ActiveCommsDown.erase(from);