#include "mc/mc.h"
#include "simgrid/Exception.hpp"
+#include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Exec.hpp"
#include "smx_private.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
return nullptr;
} else {
- return SIMIX_execution_start("suspend", "", 0.0, 1.0, 0.0, this->host_);
+ activity::ExecImplPtr exec = activity::ExecImplPtr(new activity::ExecImpl("suspend", "", nullptr, this->host_));
+ exec->start(0.0, 1.0, 0.0);
+ return exec;
}
}
double bound, sg_host_t host)
{
return simgrid::simix::simcall([name, category, flops_amount, priority, bound, host] {
- return SIMIX_execution_start(name, category, flops_amount, priority, bound, host);
+ simgrid::kernel::activity::ExecImplPtr exec =
+ simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, category, nullptr, host));
+ exec->start(flops_amount, priority, bound);
+ return exec;
});
}
return host->get_cname();
}
-simgrid::kernel::activity::ExecImplPtr SIMIX_execution_start(std::string name, std::string category,
- 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)
- surf_action->set_bound(bound);
- }
-
- simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr(
- new simgrid::kernel::activity::ExecImpl(name, category, /*timeout_detector*/ nullptr, host));
- if (surf_action != nullptr) {
- exec->surf_action_ = surf_action;
- exec->surf_action_->set_data(exec.get());
- }
- XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name_.c_str());
- simgrid::kernel::activity::ExecImpl::on_creation(exec);
-
- return exec;
-}
-
simgrid::kernel::activity::ExecImplPtr SIMIX_execution_parallel_start(std::string name, int host_nb,
sg_host_t* host_list, double* flops_amount,
double* bytes_amount, double rate, double timeout)
XBT_PRIVATE void SIMIX_execution_finish(smx_activity_t synchro);
-XBT_PRIVATE simgrid::kernel::activity::ExecImplPtr SIMIX_execution_start(std::string name, std::string category,
- double flops_amount, double priority,
- double bound, sg_host_t host);
XBT_PRIVATE simgrid::kernel::activity::ExecImplPtr
SIMIX_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list, double* flops_amount,
double* bytes_amount, double rate, double timeout);