X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..1b4dc02411d79e4c367d331b85c1b295ec41edff:/src/surf/HostImpl.cpp

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index f718d80ada..012ad13ce8 100644
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -23,29 +23,8 @@ 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)
+static inline double has_cost(double* array, size_t pos)
 {
   if (array)
     return array[pos];
@@ -53,11 +32,11 @@ static inline double has_cost(double* array, int pos)
     return -1.0;
 }
 
-kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** host_list, double* flops_amount,
+kernel::resource::Action* HostModel::execute_parallel(size_t host_nb, s4u::Host** host_list, double* flops_amount,
                                                       double* bytes_amount, double rate)
 {
   kernel::resource::Action* action = nullptr;
-  if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0)) {
+  if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) {
     action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
   } else if ((host_nb == 1) && (has_cost(flops_amount, 0) <= 0)) {
     action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate);
@@ -65,7 +44,7 @@ kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** h
     int nb = 0;
     double value = 0.0;
 
-    for (int i = 0; i < host_nb * host_nb; i++) {
+    for (size_t i = 0; i < host_nb * host_nb; i++) {
       if (has_cost(bytes_amount, i) > 0.0) {
         nb++;
         value = has_cost(bytes_amount, i);
@@ -87,9 +66,6 @@ kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** h
         " - Self-comms with one host only\n"
         " - Communications with two hosts and no computation");
   }
-  delete[] host_list;
-  delete[] flops_amount;
-  delete[] bytes_amount;
   return action;
 }
 
@@ -121,14 +97,14 @@ HostImpl::~HostImpl()
 
 /** Re-starts all the actors that are marked as restartable.
  *
- * Weird things will happen if you turn on an host that is already on. S4U is fool-proof, not this.
+ * Weird things will happen if you turn on a host that is already on. S4U is fool-proof, not this.
  */
 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)
@@ -166,7 +142,7 @@ std::vector<s4u::ActorPtr> HostImpl::get_all_actors()
     res.push_back(actor.ciface());
   return res;
 }
-int HostImpl::get_actor_count()
+size_t HostImpl::get_actor_count()
 {
   return process_list_.size();
 }