-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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. */
#include "mc/mc.h"
+#include "simgrid/Exception.hpp"
#include "smx_private.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/simix/smx_host_private.hpp"
-#include "xbt/ex.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
return host->get_cname();
}
-/**
- * \brief Add a process to the list of the processes that the host will restart when it comes back
- * This function add a process to the list of the processes that will be restarted when the host comes
- * back. It is expected that this function is called when the host is down.
- * The processes will only be restarted once, meaning that you will have to register the process
- * again to restart the process again.
- */
-void SIMIX_host_add_auto_restart_process(sg_host_t host, simgrid::kernel::actor::ActorImpl* actor)
-{
- simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(host, actor);
-
- if (host->is_off() && 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->get_cname());
- host->pimpl_->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::kernel::actor::ProcessArg*> process_list = host->pimpl_->auto_restart_processes_;
-
- for (auto const& arg : process_list) {
- 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)
- simcall_process_set_kill_time(actor, arg->kill_time);
- if (arg->auto_restart)
- actor->auto_restart_ = arg->auto_restart;
- }
- process_list.clear();
-}
-
-boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
-SIMIX_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host)
-{
- /* set surf's action */
- simgrid::kernel::resource::Action* surf_action = nullptr;
- if (not MC_is_active() && not MC_record_replay_is_active()) {
- surf_action = host->pimpl_cpu->execution_start(flops_amount);
- surf_action->set_priority(priority);
- if (bound > 0)
- 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);
-
- return exec;
-}
-
-boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
-SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
- double* bytes_amount, double rate, double timeout)
+simgrid::kernel::activity::ExecImplPtr
+SIMIX_execution_parallel_start(std::string name, int host_nb, const sg_host_t* host_list, const double* flops_amount,
+ const double* bytes_amount, double rate, double timeout)
{
/* Check that we are not mixing VMs and PMs in the parallel task */
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()) {
- sg_host_t* host_list_cpy = new sg_host_t[host_nb];
- std::copy_n(host_list, host_nb, host_list_cpy);
- surf_action = surf_host_model->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
+ surf_action = surf_host_model->execute_parallel(host_nb, host_list, flops_amount, bytes_amount, rate);
if (timeout > 0) {
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));
-
+ new simgrid::kernel::activity::ExecImpl(name, "", timeout_detector, nullptr));
+ if (surf_action != nullptr) {
+ exec->surf_action_ = surf_action;
+ exec->surf_action_->set_data(exec.get());
+ }
XBT_DEBUG("Create parallel execute synchro %p", exec.get());
return exec;
case SIMIX_FAILED:
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");
+ simcall->issuer->context_->iwannadie = true;
+ simcall->issuer->exception =
+ std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
break;
case SIMIX_CANCELED:
case SIMIX_TIMEOUT:
XBT_DEBUG("SIMIX_execution_finished: execution timeouted");
- SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Timeouted");
+ simcall->issuer->exception = std::make_exception_ptr(simgrid::TimeoutError(XBT_THROW_POINT, "Timeouted"));
break;
default:
xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", (int)exec->state_);
}
- /* Fail the process if the host is down */
- if (simcall->issuer->host_->is_off())
- simcall->issuer->context_->iwannadie = 1;
simcall->issuer->waiting_synchro = nullptr;
simcall_execution_wait__set__result(simcall, exec->state_);
- SIMIX_simcall_answer(simcall);
- }
-}
-void SIMIX_set_category(smx_activity_t synchro, const char *category)
-{
- if (synchro->state_ != SIMIX_RUNNING)
- return;
-
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
- if (exec != nullptr) {
- exec->surf_action_->set_category(category);
- return;
- }
-
- simgrid::kernel::activity::CommImplPtr comm =
- boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
- if (comm != nullptr) {
- comm->surfAction_->set_category(category);
+ /* Fail the process if the host is down */
+ if (simcall->issuer->host_->is_on())
+ SIMIX_simcall_answer(simcall);
+ else
+ simcall->issuer->context_->iwannadie = true;
}
}
