-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2016. 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. */
#include "smx_private.h"
#include "src/mc/mc_replay.h"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "src/surf/HostImpl.hpp"
-#include "xbt/sysdep.h"
#include <xbt/ex.hpp>
-#include "src/kernel/activity/SynchroExec.hpp"
#include "src/kernel/activity/SynchroComm.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
void Host::turnOn()
{
for (auto arg : boot_processes) {
- XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->name().c_str());
+ XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->cname());
simix_global->create_process_function(arg->name.c_str(),
arg->code,
nullptr,
/** @brief Stop the host if it is on */
void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
{
- smx_host_priv_t host = sg_host_simix(h);
+ simgrid::simix::Host* host = h->extension<simgrid::simix::Host>();
xbt_assert((host != nullptr), "Invalid parameters");
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->name.c_str(), sg_host_get_name(process->host),
- issuer->name.c_str());
+ XBT_DEBUG("Killing %s@%s on behalf of %s", process->cname(), process->host->cname(), issuer->cname());
}
}
} else {
- XBT_INFO("Host %s is already off", h->name().c_str());
+ XBT_INFO("Host %s is already off", h->cname());
}
}
if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
return "";
- return sg_host_get_name(host);
+ return host->cname();
}
-void _SIMIX_host_free_process_arg(void *data)
-{
- smx_process_arg_t arg = *(static_cast<smx_process_arg_t*>(data));
- delete arg;
-}
/**
* \brief Add a process to the list of the processes that the host will restart when it comes back
* This function add a process to the list of the processes that will be restarted when the host comes
arg->properties = properties;
arg->auto_restart = auto_restart;
- if( host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
- xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,nullptr);
- XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
+ if (host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib, host->cname())) {
+ xbt_dict_set(watched_hosts_lib, host->cname(), host, nullptr);
+ XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF", host->cname());
}
- sg_host_simix(host)->auto_restart_processes.push_back(arg);
+ 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 = sg_host_simix(host)->auto_restart_processes;
- if (process_list.empty())
- return;
+ std::vector<simgrid::simix::ProcessArg*> process_list =
+ host->extension<simgrid::simix::Host>()->auto_restart_processes;
for (auto arg : process_list) {
-
- XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->name().c_str());
+ XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->cname());
simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->kill_time,
arg->properties, arg->auto_restart, nullptr);
}
break;
case SIMIX_FAILED:
- XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_get_name(simcall->issuer->host));
+ XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->cname());
simcall->issuer->context->iwannadie = 1;
SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
break;
simgrid::kernel::activity::Comm *comm = dynamic_cast<simgrid::kernel::activity::Comm *>(synchro);
if (comm != nullptr) {
comm->surf_comm->setCategory(category);
- return;
}
}