}
}
-sg_host_t sg_host_self()
-{
- smx_actor_t process = SIMIX_process_self();
- return (process == nullptr) ? nullptr : process->host;
-}
-
/* needs to be public and without simcall for exceptions and logging events */
const char* sg_host_self_get_name()
{
double kill_time, std::map<std::string, std::string>* properties,
int auto_restart)
{
- smx_process_arg_t arg = new simgrid::simix::ProcessArg();
- arg->name = name;
- arg->code = std::move(code);
- arg->data = data;
- arg->host = host;
- arg->kill_time = kill_time;
+ simgrid::kernel::actor::ProcessArg* arg =
+ new simgrid::kernel::actor::ProcessArg(name, code, data, host, kill_time, nullptr, auto_restart);
arg->properties.reset(properties, [](decltype(properties)) {});
- arg->auto_restart = auto_restart;
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());
}
+ XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->getCname());
host->extension<simgrid::simix::Host>()->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::simix::ProcessArg*> process_list =
+ std::vector<simgrid::kernel::actor::ProcessArg*> process_list =
host->extension<simgrid::simix::Host>()->auto_restart_processes;
for (auto const& arg : process_list) {
process_list.clear();
}
-boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
-simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, double priority,
- double bound, sg_host_t host)
-{
- return SIMIX_execution_start(name, flops_amount, priority, bound, host);
-}
-
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));
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_->set_data(exec.get());
exec->surfAction_->setSharingWeight(priority);
if (bound > 0)
- static_cast<simgrid::surf::CpuAction*>(exec->surfAction_)->setBound(bound);
+ static_cast<simgrid::surf::CpuAction*>(exec->surfAction_)->set_bound(bound);
}
XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str());
+ simgrid::kernel::activity::ExecImpl::onCreation(exec);
return exec;
}
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());
+ exec->surfAction_->set_data(exec.get());
if (timeout > 0) {
exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
- exec->timeoutDetector->setData(exec.get());
+ exec->timeoutDetector->set_data(exec.get());
}
}
XBT_DEBUG("Create parallel execute synchro %p", exec.get());
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro)
{
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state);
/* Associate this simcall to the synchro */
/* set surf's synchro */
if (MC_is_active() || MC_record_replay_is_active()) {
synchro->state = SIMIX_DONE;
- SIMIX_execution_finish(exec);
+ SIMIX_execution_finish(synchro);
return;
}
/* If the synchro is already finished then perform the error handling */
if (synchro->state != SIMIX_RUNNING)
- SIMIX_execution_finish(exec);
+ SIMIX_execution_finish(synchro);
}
-void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec)
+void simcall_HANDLER_execution_test(smx_simcall_t simcall, smx_activity_t synchro)
{
- for (smx_simcall_t const& simcall : exec->simcalls) {
+ 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);
+ 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);
+}
+
+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) {
case SIMIX_DONE: