X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e5babd61cf6c92d3d3a87a6d66d559ed0422777..cd69840685d892d134e13ece4d7913fb7ebb61b7:/src/surf/surf_interface.hpp?ds=sidebyside diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 0a48400102..32289c342f 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -63,52 +63,7 @@ static inline int double_equals(double value1, double value2, double precision) return (fabs(value1 - value2) < precision); } -/** @ingroup SURF_models - * @brief Initializes the CPU model with the model Cas01 - * - * By default, this model uses the lazy optimization mechanism that relies on partial invalidation in LMM and a heap - * for lazy action update. - * You can change this behavior by setting the cpu/optim configuration variable to a different value. - * - * You shouldn't have to call it by yourself. - */ -XBT_PUBLIC void surf_cpu_model_init_Cas01(); - -XBT_PUBLIC void surf_disk_model_init_S19(); - -/** @ingroup SURF_models - * @brief Initializes the VM model used in the platform - * - * A VM model depends on the physical CPU model to share the resources inside the VM - * It will also creates the CPU model for actions running inside the VM - * - */ -XBT_PUBLIC void surf_vm_model_init_HL13(simgrid::kernel::resource::CpuModel* cpu_pm_model); - -/** @ingroup SURF_models - * @brief Initializes the platform with a compound host model - * - * This function should be called after a cpu_model and a network_model have been set up. - */ -XBT_PUBLIC void surf_host_model_init_compound(); - -/** @ingroup SURF_models - * @brief Initializes the platform with the current best network and cpu models at hand - * - * This platform model separates the host model and the network model. - * The host model will be initialized with the model compound, the network model with the model LV08 (with cross - * traffic support) and the CPU model with the model Cas01. - * Such model is subject to modification with warning in the ChangeLog so monitor it! - */ -XBT_PUBLIC void surf_host_model_init_current_default(); - -/** @ingroup SURF_models - * @brief Initializes the platform with the model L07 - * - * With this model, only parallel tasks can be used. Resource sharing is done by identifying bottlenecks and giving an - * equal share of the model to each action. - */ -XBT_PUBLIC void surf_host_model_init_ptask_L07(); +XBT_PUBLIC void surf_vm_model_init_HL13(); /* -------------------- * Model Descriptions @@ -117,12 +72,6 @@ XBT_PUBLIC void surf_host_model_init_ptask_L07(); /** @brief The list of all available optimization modes (both for cpu and networks). * These optimization modes can be set using --cfg=cpu/optim:... and --cfg=network/optim:... */ XBT_PUBLIC_DATA simgrid::ModuleGroup surf_optimization_mode_description; -/** @brief The list of all cpu models (pick one with --cfg=cpu/model) */ -XBT_PUBLIC_DATA simgrid::ModuleGroup surf_cpu_model_description; -/** @brief The list of all disk models (pick one with --cfg=disk/model) */ -XBT_PUBLIC_DATA simgrid::ModuleGroup surf_disk_model_description; -/** @brief The list of all host models (pick one with --cfg=host/model:) */ -XBT_PUBLIC_DATA simgrid::ModuleGroup surf_host_model_description; void simgrid_create_models();