X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3d4c51aace6f9daab7ee7bf664d9d56c81070f8..2eb9b18898a625855f580a0b98a262568b084423:/src/simix/smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index a51febd7dd..7425bc3735 100644
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -1,16 +1,15 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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. */
 
 #include "mc/mc.h"
 #include "smx_private.hpp"
-#include "src/kernel/activity/CommImpl.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/simix/smx_host_private.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/ex.hpp"
-#include <algorithm>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
 
@@ -30,7 +29,7 @@ namespace simgrid {
       if (not process_list.empty()) {
         std::string msg     = std::string("Shutting down host, but it's not empty:");
         for (auto const& process : process_list)
-          msg += "\n\t" + std::string(process.getName());
+          msg += "\n\t" + std::string(process.get_name());
 
         SIMIX_display_process_status();
         THROWF(arg_error, 0, "%s", msg.c_str());
@@ -50,7 +49,7 @@ namespace simgrid {
     void Host::turnOn()
     {
       for (auto const& arg : boot_processes) {
-        XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->getCname());
+        XBT_DEBUG("Booting Process %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);
         if (arg->kill_time >= 0)
@@ -70,18 +69,18 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
   xbt_assert((host != nullptr), "Invalid parameters");
 
   if (h->isOn()) {
-    h->pimpl_cpu->turnOff();
+    h->pimpl_cpu->turn_off();
 
     /* Clean Simulator data */
     if (not host->process_list.empty()) {
       for (auto& process : host->process_list) {
         SIMIX_process_kill(&process, issuer);
-        XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process.getCname(),
-                  process.host->getCname(), issuer->getCname());
+        XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process.get_cname(),
+                  process.host->get_cname(), issuer->get_cname());
       }
     }
   } else {
-    XBT_INFO("Host %s is already off", h->getCname());
+    XBT_INFO("Host %s is already off", h->get_cname());
   }
 }
 
@@ -92,7 +91,7 @@ const char* sg_host_self_get_name()
   if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
     return "";
 
-  return host->getCname();
+  return host->get_cname();
 }
 
 /**
@@ -106,26 +105,26 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std::
                                          double kill_time, std::map<std::string, std::string>* properties,
                                          int auto_restart)
 {
-  simgrid::simix::ProcessArg* arg =
-      new simgrid::simix::ProcessArg(name, code, data, host, kill_time, nullptr, auto_restart);
+  simgrid::kernel::actor::ProcessArg* arg =
+      new simgrid::kernel::actor::ProcessArg(name, code, data, host, kill_time, nullptr, auto_restart);
   arg->properties.reset(properties, [](decltype(properties)) {});
 
-  if (host->isOff() && watched_hosts.find(host->getCname()) == watched_hosts.end()) {
-    watched_hosts.insert(host->getCname());
-    XBT_DEBUG("Push host %s to watched_hosts because state == SURF_RESOURCE_OFF", host->getCname());
+  if (host->isOff() && watched_hosts.find(host->get_cname()) == watched_hosts.end()) {
+    watched_hosts.insert(host->get_cname());
+    XBT_DEBUG("Push host %s to watched_hosts because state == SURF_RESOURCE_OFF", host->get_cname());
   }
-  XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->getCname());
+  XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->get_cname());
   host->extension<simgrid::simix::Host>()->auto_restart_processes.push_back(arg);
 }
 
 /** @brief Restart the list of processes that have been registered to the host */
 void SIMIX_host_autorestart(sg_host_t host)
 {
-  std::vector<simgrid::simix::ProcessArg*> process_list =
+  std::vector<simgrid::kernel::actor::ProcessArg*> process_list =
       host->extension<simgrid::simix::Host>()->auto_restart_processes;
 
   for (auto const& arg : process_list) {
-    XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->getCname());
+    XBT_DEBUG("Restarting Process %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);
     if (arg->kill_time >= 0)
@@ -147,11 +146,11 @@ SIMIX_execution_start(const char* name, double flops_amount, double priority, do
   if (not MC_is_active() && not MC_record_replay_is_active()) {
 
     exec->surfAction_ = host->pimpl_cpu->execution_start(flops_amount);
-    exec->surfAction_->setData(exec.get());
-    exec->surfAction_->setSharingWeight(priority);
+    exec->surfAction_->set_data(exec.get());
+    exec->surfAction_->set_priority(priority);
 
     if (bound > 0)
-      static_cast<simgrid::surf::CpuAction*>(exec->surfAction_)->setBound(bound);
+      static_cast<simgrid::surf::CpuAction*>(exec->surfAction_)->set_bound(bound);
   }
 
   XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str());
@@ -181,11 +180,11 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li
     /* set surf's synchro */
     sg_host_t* host_list_cpy = new sg_host_t[host_nb];
     std::copy_n(host_list, host_nb, host_list_cpy);
-    exec->surfAction_ = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
-    exec->surfAction_->setData(exec.get());
+    exec->surfAction_ = surf_host_model->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
+    exec->surfAction_->set_data(exec.get());
     if (timeout > 0) {
       exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
-      exec->timeoutDetector->setData(exec.get());
+      exec->timeoutDetector->set_data(exec.get());
     }
   }
   XBT_DEBUG("Create parallel execute synchro %p", exec.get());
@@ -243,7 +242,7 @@ void SIMIX_execution_finish(smx_activity_t synchro)
         break;
 
       case SIMIX_FAILED:
-        XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->getCname());
+        XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->get_cname());
         simcall->issuer->context->iwannadie = 1;
         SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
         break;
@@ -280,13 +279,13 @@ void SIMIX_set_category(smx_activity_t synchro, const char *category)
   simgrid::kernel::activity::ExecImplPtr exec =
       boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
   if (exec != nullptr) {
-    exec->surfAction_->setCategory(category);
+    exec->surfAction_->set_category(category);
     return;
   }
 
   simgrid::kernel::activity::CommImplPtr comm =
       boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
   if (comm != nullptr) {
-    comm->surfAction_->setCategory(category);
+    comm->surfAction_->set_category(category);
   }
 }