From: Martin Quinson Date: Wed, 6 Jan 2016 09:10:41 +0000 (+0100) Subject: NetworkCM02: various cosmetics X-Git-Tag: v3_13~1336 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4f122005a77f0e46356059231f029c4738c8bd87 NetworkCM02: various cosmetics --- diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index a17692f73c..1858cfdaf1 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -84,13 +84,11 @@ void surf_network_model_init_CM02(void) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 1.0); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 1.0); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 1.0); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 0.0); } @@ -110,16 +108,13 @@ void surf_network_model_init_Reno(void) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, - func_reno_fpi); + lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); surf_network_model->f_networkSolve = lagrange_solve; xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 0.92); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } @@ -130,18 +125,14 @@ void surf_network_model_init_Reno2(void) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, - func_reno2_fpi); + lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); surf_network_model->f_networkSolve = lagrange_solve; xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 0.92); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", - 8775); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } void surf_network_model_init_Vegas(void) @@ -150,16 +141,13 @@ void surf_network_model_init_Vegas(void) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); + xbt_dynar_push(all_existing_models, &surf_network_model); net_define_callbacks(); - simgrid::surf::Model *model = surf_network_model; - xbt_dynar_push(all_existing_models, &model); - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, - func_vegas_fpi); + lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); surf_network_model->f_networkSolve = lagrange_solve; xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4); - xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", - 0.92); + xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor", 0.92); xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775); } @@ -202,8 +190,6 @@ NetworkCm02Model::NetworkCm02Model() p_modifiedSet = new ActionLmmList(); p_maxminSystem->keep_track = p_modifiedSet; } - - m_haveGap = false; } Link* NetworkCm02Model::createLink(const char *name, diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 8d7e33a266..e968bffe1a 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -43,10 +43,7 @@ namespace simgrid { namespace surf { class NetworkCm02Model : public NetworkModel { -private: - void initialize(); public: - NetworkCm02Model(int /*i*/) : NetworkModel() {}; NetworkCm02Model(); ~NetworkCm02Model() { } Link* createLink(const char *name, @@ -58,13 +55,14 @@ public: tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override; - void addTraces(); - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); + void addTraces() override; + void updateActionsStateLazy(double now, double delta) override; + void updateActionsStateFull(double now, double delta) override; Action *communicate(NetCard *src, NetCard *dst, - double size, double rate); - bool shareResourcesIsIdempotent() {return true;} + double size, double rate) override; + bool shareResourcesIsIdempotent() override {return true;} virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {}; +protected: bool m_haveGap = false; }; @@ -85,9 +83,9 @@ public: double lat_initial, tmgr_trace_t lat_trace, e_surf_link_sharing_policy_t policy); - void updateState(tmgr_trace_event_t event_type, double value, double date); - void updateBandwidth(double value, double date=surf_get_clock()); - void updateLatency(double value, double date=surf_get_clock()); + void updateState(tmgr_trace_event_t event_type, double value, double date) override; + void updateBandwidth(double value, double date=surf_get_clock()) override; + void updateLatency(double value, double date=surf_get_clock()) override; virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};