#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");
}} // namespaces
-/** @brief Stop the host if it is on */
-void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
-{
- simgrid::simix::Host* host = h->extension<simgrid::simix::Host>();
-
- xbt_assert((host != nullptr), "Invalid parameters");
-
- if (h->isOn()) {
- h->pimpl_cpu->turnOff();
-
- /* 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.get_cname(),
- process.host->get_cname(), issuer->get_cname());
- }
- }
- } else {
- XBT_INFO("Host %s is already off", h->get_cname());
- }
-}
-
/* needs to be public and without simcall for exceptions and logging events */
const char* sg_host_self_get_name()
{
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_->set_data(exec.get());
- exec->surfAction_->set_priority(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_)->set_bound(bound);
+ static_cast<simgrid::surf::CpuAction*>(surf_action)->set_bound(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, 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;
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->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
- exec->surfAction_->set_data(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->set_data(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;
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro)
{
- XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state);
+ XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state_);
/* Associate this simcall to the synchro */
- synchro->simcalls.push_back(simcall);
+ synchro->simcalls_.push_back(simcall);
simcall->issuer->waiting_synchro = synchro;
/* set surf's synchro */
if (MC_is_active() || MC_record_replay_is_active()) {
- synchro->state = SIMIX_DONE;
+ synchro->state_ = SIMIX_DONE;
SIMIX_execution_finish(synchro);
return;
}
/* If the synchro is already finished then perform the error handling */
- if (synchro->state != SIMIX_RUNNING)
+ if (synchro->state_ != SIMIX_RUNNING)
SIMIX_execution_finish(synchro);
}
void simcall_HANDLER_execution_test(smx_simcall_t simcall, smx_activity_t synchro)
{
- simcall_execution_test__set__result(simcall, (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING));
- if (simcall_execution_test__get__result(simcall)) {
- synchro->simcalls.push_back(simcall);
+ int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
+ if (res) {
+ synchro->simcalls_.push_back(simcall);
SIMIX_execution_finish(synchro);
} else {
SIMIX_simcall_answer(simcall);
}
- /* If the synchro is already finished then perform the error handling */
- if (synchro->state != SIMIX_RUNNING)
- SIMIX_execution_finish(synchro);
+ simcall_execution_test__set__result(simcall, res);
}
void SIMIX_execution_finish(smx_activity_t synchro)
simgrid::kernel::activity::ExecImplPtr exec =
boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
- while (not synchro->simcalls.empty()) {
- smx_simcall_t simcall = synchro->simcalls.front();
- synchro->simcalls.pop_front();
- switch (exec->state) {
+ while (not synchro->simcalls_.empty()) {
+ smx_simcall_t simcall = synchro->simcalls_.front();
+ synchro->simcalls_.pop_front();
+ switch (exec->state_) {
case SIMIX_DONE:
/* do nothing, synchro done */
break;
default:
- xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d",
- (int)exec->state);
+ 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->isOff())
simcall->issuer->context->iwannadie = 1;
simcall->issuer->waiting_synchro = nullptr;
- simcall_execution_wait__set__result(simcall, exec->state);
+ 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)
+ if (synchro->state_ != SIMIX_RUNNING)
return;
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
if (exec != nullptr) {
- exec->surfAction_->set_category(category);
+ exec->surf_action_->set_category(category);
return;
}
