-/* 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");
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());
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)
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());
}
}
if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
return "";
- return host->getCname();
+ return host->get_cname();
}
/**
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);
}
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)
boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
SIMIX_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host)
{
- /* alloc structures and initialize */
- simgrid::kernel::activity::ExecImplPtr exec =
- simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, host));
-
/* set surf's action */
+ simgrid::kernel::resource::Action* surf_action = nullptr;
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);
-
+ surf_action = host->pimpl_cpu->execution_start(flops_amount);
+ surf_action->set_priority(priority);
if (bound > 0)
- static_cast<simgrid::surf::CpuAction*>(exec->surfAction_)->setBound(bound);
+ static_cast<simgrid::surf::CpuAction*>(surf_action)->set_bound(bound);
}
+ simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr(
+ new simgrid::kernel::activity::ExecImpl(name, surf_action, /*timeout_detector*/ nullptr, host));
+
XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str());
simgrid::kernel::activity::ExecImpl::onCreation(exec);
double* bytes_amount, double rate, double timeout)
{
- /* alloc structures and initialize */
- simgrid::kernel::activity::ExecImplPtr exec =
- simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, nullptr));
-
/* Check that we are not mixing VMs and PMs in the parallel task */
bool is_a_vm = (nullptr != dynamic_cast<simgrid::s4u::VirtualMachine*>(host_list[0]));
for (int i = 1; i < host_nb; i++) {
}
/* set surf's synchro */
+ simgrid::kernel::resource::Action* surf_action = nullptr;
+ simgrid::kernel::resource::Action* timeout_detector = nullptr;
if (not MC_is_active() && not MC_record_replay_is_active()) {
- /* 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());
+ surf_action = surf_host_model->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
if (timeout > 0) {
- exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
- exec->timeoutDetector->setData(exec.get());
+ timeout_detector = host_list[0]->pimpl_cpu->sleep(timeout);
}
}
+
+ simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr(
+ new simgrid::kernel::activity::ExecImpl(name, surf_action, timeout_detector, nullptr));
+
XBT_DEBUG("Create parallel execute synchro %p", exec.get());
return exec;
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;
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);
}
}