-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. 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. */
}
}
-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) {
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_->setSharingWeight(priority);
+ exec->surfAction_->set_data(exec.get());
+ exec->surfAction_->set_priority(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());
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());
simgrid::kernel::activity::ExecImplPtr exec =
boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
if (exec != nullptr) {
- exec->surfAction_->setCategory(category);
+ exec->surfAction_->set_category(category);
return;
}
simgrid::kernel::activity::CommImplPtr comm =
boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
if (comm != nullptr) {
- comm->surfAction_->setCategory(category);
+ comm->surfAction_->set_category(category);
}
}