From 285fd7f4f1459beec616ace009d55cb3f22b3c8f Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 27 Nov 2017 10:34:49 +0100 Subject: [PATCH] Put lmm definitions in namespace simgrid::surf. --- src/include/surf/datatypes.hpp | 4 ++++ src/include/surf/maxmin.hpp | 5 +++++ src/plugins/vm/VirtualMachineImpl.cpp | 2 +- src/surf/fair_bottleneck.cpp | 2 +- src/surf/lagrange.cpp | 5 +++++ src/surf/maxmin.cpp | 11 ++++++++--- src/surf/network_cm02.cpp | 15 +++++++++------ teshsuite/surf/lmm_usage/lmm_usage.cpp | 2 ++ teshsuite/surf/maxmin_bench/maxmin_bench.cpp | 2 ++ 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/include/surf/datatypes.hpp b/src/include/surf/datatypes.hpp index 30a80d6c12..235dbf1eb5 100644 --- a/src/include/surf/datatypes.hpp +++ b/src/include/surf/datatypes.hpp @@ -6,10 +6,14 @@ #ifndef MAXMIN_DATATYPES_HPP #define MAXMIN_DATATYPES_HPP +namespace simgrid { +namespace surf { typedef struct s_lmm_element_t* lmm_element_t; typedef struct s_lmm_variable_t* lmm_variable_t; typedef struct s_lmm_constraint_t* lmm_constraint_t; typedef struct s_lmm_constraint_light_t* lmm_constraint_light_t; typedef struct s_lmm_system_t* lmm_system_t; +} +} #endif diff --git a/src/include/surf/maxmin.hpp b/src/include/surf/maxmin.hpp index 97239fd843..1012ce1b1c 100644 --- a/src/include/surf/maxmin.hpp +++ b/src/include/surf/maxmin.hpp @@ -17,6 +17,9 @@ #include #include +namespace simgrid { +namespace surf { + /** @addtogroup SURF_lmm * @details * A linear maxmin solver to resolve inequations systems. @@ -574,5 +577,7 @@ extern XBT_PRIVATE double (*func_fp_def)(lmm_variable_t, double); extern XBT_PRIVATE double (*func_fpi_def)(lmm_variable_t, double); /** @} */ +} +} #endif diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 2cccd60a8d..1a1f03aa08 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -98,7 +98,7 @@ double VMModel::nextOccuringEvent(double now) XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getCname(), ws_vm->pimpl_vm_->getPm()->getCname()); xbt_assert(cpu->model() == surf_cpu_model_vm); - lmm_system_t vcpu_system = cpu->model()->getMaxminSystem(); + surf::lmm_system_t vcpu_system = cpu->model()->getMaxminSystem(); vcpu_system->update_constraint_bound(cpu->constraint(), virt_overhead * solved_value); } diff --git a/src/surf/fair_bottleneck.cpp b/src/surf/fair_bottleneck.cpp index 7066a8fb3d..26957175e4 100644 --- a/src/surf/fair_bottleneck.cpp +++ b/src/surf/fair_bottleneck.cpp @@ -17,7 +17,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_maxmin); #define SHOW_EXPR_D(expr) XBT_DEBUG(#expr " = %d",expr); #define SHOW_EXPR_P(expr) XBT_DEBUG(#expr " = %p",expr); -void bottleneck_solve(lmm_system_t sys) +void simgrid::surf::bottleneck_solve(lmm_system_t sys) { void *_var; void *_var_next; diff --git a/src/surf/lagrange.cpp b/src/surf/lagrange.cpp index ad77731e30..221b5c3534 100644 --- a/src/surf/lagrange.cpp +++ b/src/surf/lagrange.cpp @@ -22,6 +22,9 @@ XBT_LOG_NEW_SUBCATEGORY(surf_lagrange_dichotomy, surf_lagrange, "Logging specifi #define SHOW_EXPR(expr) XBT_CDEBUG(surf_lagrange,#expr " = %g",expr); +namespace simgrid { +namespace surf { + double (*func_f_def) (lmm_variable_t, double); double (*func_fp_def) (lmm_variable_t, double); double (*func_fpi_def) (lmm_variable_t, double); @@ -561,3 +564,5 @@ double func_reno2_fpi(lmm_variable_t var, double x) res_fpi = RENO2_SCALING * (-3.0 * tmp + sqrt(res_fpi)) / (4.0 * tmp); return res_fpi; } +} +} diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp index f4a86af978..0ae0d70fbb 100644 --- a/src/surf/maxmin.cpp +++ b/src/surf/maxmin.cpp @@ -19,12 +19,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)"); -typedef std::vector dyn_light_t; - double sg_maxmin_precision = 0.00001; /* Change this with --cfg=maxmin/precision:VALUE */ double sg_surf_precision = 0.00001; /* Change this with --cfg=surf/precision:VALUE */ int sg_concurrency_limit = -1; /* Change this with --cfg=maxmin/concurrency-limit:VALUE */ +namespace simgrid { +namespace surf { + +typedef std::vector dyn_light_t; + int s_lmm_variable_t::Global_debug_id = 1; int s_lmm_constraint_t::Global_debug_id = 1; @@ -744,7 +747,7 @@ void s_lmm_variable_t::initialize(simgrid::surf::Action* id_value, double sharin int number_of_constraints, unsigned visited_value) { id = id_value; - id_int = s_lmm_variable_t::Global_debug_id++; + id_int = Global_debug_id++; cnsts.reserve(number_of_constraints); sharing_weight = sharing_weight_value; staged_weight = 0.0; @@ -1017,3 +1020,5 @@ int s_lmm_constraint_t::get_variable_amount() const } return result; } +} +} diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 1714c0f430..915e5c21a9 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -87,13 +87,14 @@ void surf_network_model_init_Reno() if (surf_network_model) return; - lmm_set_default_protocol_function(func_reno_f, func_reno_fp, func_reno_fpi); + lmm_set_default_protocol_function(simgrid::surf::func_reno_f, simgrid::surf::func_reno_fp, + simgrid::surf::func_reno_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); xbt_cfg_setdefault_double("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve); all_existing_models->push_back(surf_network_model); } @@ -103,13 +104,14 @@ void surf_network_model_init_Reno2() if (surf_network_model) return; - lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, func_reno2_fpi); + lmm_set_default_protocol_function(simgrid::surf::func_reno2_f, simgrid::surf::func_reno2_fp, + simgrid::surf::func_reno2_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); xbt_cfg_setdefault_double("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve); all_existing_models->push_back(surf_network_model); } @@ -118,13 +120,14 @@ void surf_network_model_init_Vegas() if (surf_network_model) return; - lmm_set_default_protocol_function(func_vegas_f, func_vegas_fp, func_vegas_fpi); + lmm_set_default_protocol_function(simgrid::surf::func_vegas_f, simgrid::surf::func_vegas_fp, + simgrid::surf::func_vegas_fpi); xbt_cfg_setdefault_double("network/latency-factor", 13.01); xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97); xbt_cfg_setdefault_double("network/weight-S", 20537); - surf_network_model = new simgrid::surf::NetworkCm02Model(&lagrange_solve); + surf_network_model = new simgrid::surf::NetworkCm02Model(&simgrid::surf::lagrange_solve); all_existing_models->push_back(surf_network_model); } diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/surf/lmm_usage/lmm_usage.cpp index 14b84e8317..0a9aaf8382 100644 --- a/teshsuite/surf/lmm_usage/lmm_usage.cpp +++ b/teshsuite/surf/lmm_usage/lmm_usage.cpp @@ -17,6 +17,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); +using namespace simgrid::surf; + #define PRINT_VAR(var) XBT_DEBUG(#var " = %g", (var)->get_value()) #define SHOW_EXPR(expr) XBT_DEBUG(#expr " = %g",expr) diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp index f2d6d1978a..be01e1dd8b 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp @@ -18,6 +18,8 @@ #include #include +using namespace simgrid::surf; + double date; int64_t seedx = 0; -- 2.20.1