X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..d0d9dcbe52b4b8a3cb6125c07c2acd7af1e2f382:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index b9be1fd2ca..673c70caa5 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -27,7 +27,7 @@ void surf_network_model_init_Constant() routing_model_create(NULL); - simgrid::surf::hostCreatedCallbacks.connect([](simgrid::surf::Host*) { + simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host*) { host_number_int++; }); sg_platf_link_add_cb(netcste_parse_nolink); @@ -85,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(); @@ -95,7 +95,7 @@ Action *NetworkConstantModel::communicate(RoutingEdge *src, RoutingEdge *dst, 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; } @@ -120,26 +120,5 @@ void NetworkConstantAction::cancel() 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; -} - } }