X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d785a64b1830b6a5d05561316ef7161ee1c67671..665b37c47175d0abd08d1252180d4d37bf9a342a:/src/surf/network_cm02.cpp diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 032350e829..a2f7152a70 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -35,13 +35,13 @@ int sg_network_crosstraffic = 0; /* month = Nov, */ /* pdf = {http://hal.inria.fr/hal-00646896/PDF/rr-validity.pdf}, */ /* } */ -void surf_network_model_init_LegrandVelho(void) +void surf_network_model_init_LegrandVelho() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); @@ -59,14 +59,14 @@ void surf_network_model_init_LegrandVelho(void) /* month = {oct}, */ /* year = {2002} */ /* } */ -void surf_network_model_init_CM02(void) +void surf_network_model_init_CM02() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); xbt_cfg_setdefault_double("network/latency-factor", 1.0); xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0); @@ -83,13 +83,13 @@ void surf_network_model_init_CM02(void) /* journal={{IEEE/ACM} Transactions on Networking}, */ /* volume={11}, number={4}, */ /* } */ -void surf_network_model_init_Reno(void) +void surf_network_model_init_Reno() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); surf_network_model->f_networkSolve = lagrange_solve; @@ -100,13 +100,13 @@ void surf_network_model_init_Reno(void) } -void surf_network_model_init_Reno2(void) +void surf_network_model_init_Reno2() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); surf_network_model->f_networkSolve = lagrange_solve; @@ -116,13 +116,13 @@ void surf_network_model_init_Reno2(void) xbt_cfg_setdefault_double("network/weight-S", 8775); } -void surf_network_model_init_Vegas(void) +void surf_network_model_init_Vegas() { if (surf_network_model) return; surf_network_model = new simgrid::surf::NetworkCm02Model(); - xbt_dynar_push(all_existing_models, &surf_network_model); + all_existing_models->push_back(surf_network_model); lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); surf_network_model->f_networkSolve = lagrange_solve;