X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f2d08b0ae4625d32890dc4613e1d842ad0f7b77..2fb1fa1697309cad26ab7d472db4f8bfa617e0b4:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index ce622c4bf2..ff6f1931b5 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -23,27 +23,6 @@ namespace surf { * Model * *********/ -/* Each VM has a dummy CPU action on the PM layer. This CPU action works as the constraint (capacity) of the VM in the - * PM layer. If the VM does not have any active task, the dummy CPU action must be deactivated, so that the VM does not - * get any CPU share in the PM layer. */ -void HostModel::ignore_empty_vm_in_pm_LMM() -{ - /* iterate for all virtual machines */ - for (s4u::VirtualMachine* const& ws_vm : vm::VirtualMachineImpl::allVms_) { - Cpu* cpu = ws_vm->pimpl_cpu; - int active_tasks = cpu->get_constraint()->get_variable_amount(); - - /* The impact of the VM over its PM is the min between its vCPU amount and the amount of tasks it contains */ - int impact = std::min(active_tasks, ws_vm->get_impl()->get_core_amount()); - - XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", ws_vm, impact, active_tasks); - if (impact > 0) - ws_vm->get_impl()->action_->set_priority(1. / impact); - else - ws_vm->get_impl()->action_->set_priority(0.); - } -} - /* Helper function for executeParallelTask */ static inline double has_cost(double* array, int pos) { @@ -124,8 +103,8 @@ void HostImpl::turn_on() { for (auto const& arg : actors_at_boot_) { XBT_DEBUG("Booting Actor %s(%s) right now", arg->name.c_str(), arg->host->get_cname()); - smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, - arg->properties.get(), nullptr); + smx_actor_t actor = + SIMIX_process_create(arg->name.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (arg->auto_restart)