#include "src/kernel/activity/CommImpl.hpp"
#include "src/mc/mc_replay.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/surf/surf_interface.hpp"
#include "xbt/ex.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
Host::~Host()
{
- /* Clean Simulator data */
+ /* All processes should be gone when the host is turned off (by the end of the simulation). */
if (xbt_swag_size(process_list) != 0) {
std::string msg = std::string("Shutting down host, but it's not empty:");
smx_actor_t process = nullptr;
SIMIX_display_process_status();
THROWF(arg_error, 0, "%s", msg.c_str());
}
- for (auto arg : auto_restart_processes)
+ for (auto const& arg : auto_restart_processes)
delete arg;
auto_restart_processes.clear();
- for (auto arg : boot_processes)
+ for (auto const& arg : boot_processes)
delete arg;
boot_processes.clear();
xbt_swag_free(process_list);
*/
void Host::turnOn()
{
- for (auto arg : boot_processes) {
+ for (auto const& arg : boot_processes) {
XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->getCname());
smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host,
- arg->properties, nullptr);
+ arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
simcall_process_set_kill_time(actor, arg->kill_time);
if (arg->auto_restart)
smx_actor_t process = nullptr;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s@%s on behalf of %s", process->cname(), process->host->getCname(), issuer->cname());
+ XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process->cname(),
+ process->host->getCname(), issuer->cname());
}
}
} else {
* 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, const char *name, std::function<void()> code,
- void* data, double kill_time, xbt_dict_t properties, int auto_restart)
+void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std::function<void()> code, void* data,
+ 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->data = data;
arg->host = host;
arg->kill_time = kill_time;
- arg->properties = properties;
+ arg->properties.reset(properties, [](decltype(properties)) {});
arg->auto_restart = auto_restart;
- if (host->isOff() && not xbt_dict_get_or_null(watched_hosts_lib, host->getCname())) {
- xbt_dict_set(watched_hosts_lib, host->getCname(), host, nullptr);
- XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF", host->getCname());
+ 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());
}
host->extension<simgrid::simix::Host>()->auto_restart_processes.push_back(arg);
}
std::vector<simgrid::simix::ProcessArg*> process_list =
host->extension<simgrid::simix::Host>()->auto_restart_processes;
- for (auto arg : process_list) {
+ for (auto const& arg : process_list) {
XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->getCname());
smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host,
- arg->properties, nullptr);
+ arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
simcall_process_set_kill_time(actor, arg->kill_time);
if (arg->auto_restart)
return exec;
}
-void SIMIX_execution_cancel(smx_activity_t synchro)
-{
- XBT_DEBUG("Cancel synchro %p", synchro.get());
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
-
- if (exec->surf_exec)
- exec->surf_exec->cancel();
-}
-
-void SIMIX_execution_set_priority(smx_activity_t synchro, double priority)
-{
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
- if(exec->surf_exec)
- exec->surf_exec->setSharingWeight(priority);
-}
-
-void SIMIX_execution_set_bound(smx_activity_t synchro, double bound)
-{
- simgrid::kernel::activity::ExecImplPtr exec =
- boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(synchro);
- if(exec->surf_exec)
- static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setBound(bound);
-}
-
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro)
{
simgrid::kernel::activity::ExecImplPtr exec =
void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec)
{
- for (smx_simcall_t simcall : exec->simcalls) {
+ for (smx_simcall_t const& simcall : exec->simcalls) {
switch (exec->state) {
case SIMIX_DONE: