X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e049fe573b321fbf974191c9f084873dc306009c..25687c41a4e7abbd8c68f56f7172d5830e8fea41:/src/surf/network.cpp diff --git a/src/surf/network.cpp b/src/surf/network.cpp index 5b1896c700..8fa588e5dc 100644 --- a/src/surf/network.cpp +++ b/src/surf/network.cpp @@ -109,7 +109,7 @@ static void net_add_traces(void){ } } -static void net_define_callbacks(void) +void net_define_callbacks(void) { /* Figuring out the network links */ sg_platf_link_add_cb(net_parse_link_init); @@ -248,10 +248,8 @@ void surf_network_model_init_Vegas(void) xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } -NetworkCm02Model::NetworkCm02Model() : NetworkCm02Model("network"){ -} - -NetworkCm02Model::NetworkCm02Model(string name) : Model(name){ +void NetworkCm02Model::initialize() +{ ActionLmmPtr comm; char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim"); @@ -561,8 +559,8 @@ bool NetworkCm02LinkLmm::isShared() void NetworkCm02LinkLmm::updateState(tmgr_trace_event_t event_type, double value, double date) { - /* printf("[" "%lg" "] Asking to update network card \"%s\" with value " */ - /* "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */ + /* printf("[" "%g" "] Asking to update network card \"%s\" with value " */ + /* "%g" " for event %p\n", surf_get_clock(), nw_link->name, */ /* value, event_type); */ if (event_type == p_power.event) {