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
Use signals for platform callbacks
[simgrid.git]
/
src
/
surf
/
network_constant.cpp
diff --git
a/src/surf/network_constant.cpp
b/src/surf/network_constant.cpp
index
b9c0d76
..
e7a4195
100644
(file)
--- a/
src/surf/network_constant.cpp
+++ b/
src/surf/network_constant.cpp
@@
-23,19
+23,22
@@
static void netcste_parse_nolink(sg_platf_link_cbarg_t link){
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == NULL);
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == NULL);
- surf_network_model = new NetworkConstantModel();
+ surf_network_model = new
simgrid::surf::
NetworkConstantModel();
routing_model_create(NULL);
routing_model_create(NULL);
-
hostCreatedCallbacks.connect([](Host*
) {
+
simgrid::s4u::Host::onCreation.connect([](simgrid::s4u::Host&
) {
host_number_int++;
});
sg_platf_link_add_cb(netcste_parse_nolink);
host_number_int++;
});
sg_platf_link_add_cb(netcste_parse_nolink);
- Model *model = surf_network_model;
+
simgrid::surf::
Model *model = surf_network_model;
xbt_dynar_push(all_existing_models, &model);
}
xbt_dynar_push(all_existing_models, &model);
}
+namespace simgrid {
+namespace surf {
+
double NetworkConstantModel::shareResources(double /*now*/)
{
NetworkConstantAction *action = NULL;
double NetworkConstantModel::shareResources(double /*now*/)
{
NetworkConstantAction *action = NULL;
@@
-82,7
+85,7
@@
void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
}
}
}
}
-Action *NetworkConstantModel::communicate(
RoutingEdge *src, RoutingEdge
*dst,
+Action *NetworkConstantModel::communicate(
NetCard *src, NetCard
*dst,
double size, double rate)
{
char *src_name = src->getName();
double size, double rate)
{
char *src_name = src->getName();
@@
-92,7
+95,7
@@
Action *NetworkConstantModel::communicate(RoutingEdge *src, RoutingEdge *dst,
NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
XBT_OUT();
NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
XBT_OUT();
-
surf_callback_emit(networkCommunicateCallbacks,
action, src, dst, size, rate);
+
networkCommunicateCallbacks(
action, src, dst, size, rate);
return action;
}
return action;
}
@@
-117,24
+120,5
@@
void NetworkConstantAction::cancel()
return;
}
return;
}
-void NetworkConstantAction::setCategory(const char * /*category*/)
-{
- //ignore completely the categories in constant model, they are not traced
}
}
-
-void NetworkConstantAction::suspend()
-{
- m_suspended = true;
}
}
-
-void NetworkConstantAction::resume()
-{
- if (m_suspended)
- m_suspended = false;
-}
-
-bool NetworkConstantAction::isSuspended()
-{
- return m_suspended;
-}
-