-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2017. 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.h"
+#include "smx_private.hpp"
#include "src/kernel/activity/CommImpl.hpp"
-#include "src/mc/mc_replay.h"
+#include "src/mc/mc_replay.hpp"
#include "src/plugins/vm/VirtualMachineImpl.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 Host::EXTENSION_ID.valid())
Host::EXTENSION_ID = s4u::Host::extension_create<simix::Host>();
-
- simgrid::simix::ActorImpl act;
- process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
}
Host::~Host()
{
- /* Clean Simulator data */
- if (xbt_swag_size(process_list) != 0) {
+ /* All processes should be gone when the host is turned off (by the end of the simulation). */
+ if (not process_list.empty()) {
std::string msg = std::string("Shutting down host, but it's not empty:");
- smx_actor_t process = nullptr;
-
- xbt_swag_foreach(process, process_list) msg = msg + "\n\t" + process->name.c_str();
+ for (auto const& process : process_list)
+ msg += "\n\t" + std::string(process.getName());
SIMIX_display_process_status();
THROWF(arg_error, 0, "%s", msg.c_str());
for (auto const& arg : boot_processes)
delete arg;
boot_processes.clear();
- xbt_swag_free(process_list);
}
/** Re-starts all the actors that are marked as restartable.
for (auto const& arg : boot_processes) {
XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->getCname());
smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host,
- arg->properties, nullptr);
+ arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
simcall_process_set_kill_time(actor, arg->kill_time);
if (arg->auto_restart)
h->pimpl_cpu->turnOff();
/* Clean Simulator data */
- if (xbt_swag_size(host->process_list) != 0) {
- smx_actor_t process = nullptr;
- xbt_swag_foreach(process, host->process_list) {
- SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s@%s on behalf of %s", process->cname(), process->host->getCname(), issuer->cname());
+ 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());
}
}
} else {
arg->data = data;
arg->host = host;
arg->kill_time = kill_time;
- arg->properties = properties;
+ arg->properties.reset(properties, [](decltype(properties)) {});
arg->auto_restart = auto_restart;
if (host->isOff() && watched_hosts.find(host->getCname()) == watched_hosts.end()) {
for (auto const& arg : process_list) {
XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->getCname());
smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host,
- arg->properties, nullptr);
+ arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
simcall_process_set_kill_time(actor, arg->kill_time);
if (arg->auto_restart)
/* set surf's action */
if (not MC_is_active() && not MC_record_replay_is_active()) {
- exec->surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount);
- exec->surf_exec->setData(exec.get());
- exec->surf_exec->setSharingWeight(priority);
+ exec->surfAction_ = issuer->host->pimpl_cpu->execution_start(flops_amount);
+ exec->surfAction_->setData(exec.get());
+ exec->surfAction_->setSharingWeight(priority);
if (bound > 0)
- static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setBound(bound);
+ static_cast<simgrid::surf::CpuAction*>(exec->surfAction_)->setBound(bound);
}
XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str());
simgrid::kernel::activity::ExecImplPtr exec =
simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, nullptr));
- /* set surf's synchro */
- sg_host_t *host_list_cpy = xbt_new0(sg_host_t, host_nb);
- for (int i = 0; i < host_nb; i++)
- host_list_cpy[i] = host_list[i];
-
/* 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 */
if (not MC_is_active() && not MC_record_replay_is_active()) {
- exec->surf_exec = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
- exec->surf_exec->setData(exec.get());
+ /* 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());
if (timeout > 0) {
exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
exec->timeoutDetector->setData(exec.get());
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
if (exec != nullptr) {
- exec->surf_exec->setCategory(category);
+ exec->surfAction_->setCategory(category);
return;
}
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
if (comm != nullptr) {
- comm->surf_comm->setCategory(category);
+ comm->surfAction_->setCategory(category);
}
}