X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26a36ad4c0d6f3d032bfcf181424e7235e8ec142..c80eff88110151cbf0bf09fafeeab4b287e185ab:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 62c2f41063..52188807b4 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -162,7 +162,7 @@ NetworkCm02Model::NetworkCm02Model() routing_model_create(createLink("__loopback__", 498000000, NULL, 0.000015, NULL, - 1 /*SURF_RESOURCE_ON*/, NULL, + NULL, SURF_LINK_FATPIPE, NULL)); if (p_updateMechanism == UM_LAZY) { @@ -176,7 +176,7 @@ NetworkCm02Model::NetworkCm02Model() Link* NetworkCm02Model::createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, tmgr_trace_t lat_trace, - int initiallyOn, tmgr_trace_t state_trace, + tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) { xbt_assert(NULL == Link::byName(name), @@ -184,7 +184,7 @@ Link* NetworkCm02Model::createLink(const char *name, name); Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, - initiallyOn, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy); + state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy); Link::onCreation(link); return link; } @@ -434,17 +434,12 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst, NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props, lmm_system_t system, double constraint_value, - int initiallyOn, tmgr_trace_t state_trace, + tmgr_trace_t state_trace, double bw_peak, tmgr_trace_t bw_trace, double lat_initial, tmgr_trace_t lat_trace, e_surf_link_sharing_policy_t policy) : Link(model, name, props, lmm_constraint_new(system, this, constraint_value), state_trace) { - if (initiallyOn) - turnOn(); - else - turnOff(); - m_bandwidth.scale = 1.0; m_bandwidth.peak = bw_peak; if (bw_trace)