namespace simgrid {
namespace simix {
+ simgrid::xbt::Extension<simgrid::s4u::Host, Host> Host::EXTENSION_ID;
+
Host::Host()
{
+ if (!EXTENSION_ID.valid())
+ EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::simix::Host>();
+
simgrid::simix::ActorImpl act;
process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
}
- }
-}
-/** @brief Internal function to create a SIMIX host. */
-void SIMIX_host_create(sg_host_t host)
-{
- sg_host_simix_set(host, new simgrid::simix::Host());
-}
-
-/** @brief Start the host if it is off */
-void SIMIX_host_on(sg_host_t h)
-{
- smx_host_priv_t host = sg_host_simix(h);
-
- xbt_assert((host != nullptr), "Invalid parameters");
+ Host::~Host()
+ {
+ /* Clean Simulator data */
+ if (xbt_swag_size(process_list) != 0) {
+ char *msg = xbt_strdup("Shutting down host, but it's not empty:");
+ char *tmp;
+ smx_actor_t process = nullptr;
+
+ xbt_swag_foreach(process, process_list) {
+ tmp = bprintf("%s\n\t%s", msg, process->name.c_str());
+ free(msg);
+ msg = tmp;
+ }
+ SIMIX_display_process_status();
+ THROWF(arg_error, 0, "%s", msg);
+ }
+ for (auto arg : auto_restart_processes)
+ delete arg;
+ auto_restart_processes.clear();
+ for (auto arg : boot_processes)
+ delete arg;
+ boot_processes.clear();
+ xbt_swag_free(process_list);
+ }
- if (h->isOff()) {
- simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
- surf_host->turnOn();
-
- unsigned int cpt;
- smx_process_arg_t arg;
- xbt_dynar_foreach(host->boot_processes,cpt,arg) {
- XBT_DEBUG("Booting Process %s(%s) right now",
- arg->name.c_str(), arg->hostname);
- if (simix_global->create_process_function) {
+ /** Re-starts all the actors that are marked as restartable.
+ *
+ * Weird things will happen if you turn on an host that is already on. S4U is fool-proof, not this.
+ */
+ 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());
simix_global->create_process_function(arg->name.c_str(),
- arg->code,
- nullptr,
- arg->hostname,
- arg->kill_time,
- arg->properties,
- arg->auto_restart,
- nullptr);
- } else {
- simcall_process_create(arg->name.c_str(),
- arg->code,
- nullptr,
- arg->hostname,
- arg->kill_time,
- arg->properties,
- arg->auto_restart);
+ arg->code,
+ nullptr,
+ arg->host,
+ arg->kill_time,
+ arg->properties,
+ arg->auto_restart,
+ nullptr);
}
}
- }
-}
+
+}} // namespaces
/** @brief Stop the host if it is on */
void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
}
}
-/**
- * \brief Internal function to destroy a SIMIX host.
- *
- * \param h the host to destroy (a sg_host_t)
- */
-void SIMIX_host_destroy(void *h)
-{
- smx_host_priv_t host = static_cast<smx_host_priv_t>(h);
-
- xbt_assert((host != nullptr), "Invalid parameters");
-
- /* Clean Simulator data */
- if (xbt_swag_size(host->process_list) != 0) {
- char *msg = xbt_strdup("Shutting down host, but it's not empty:");
- char *tmp;
- smx_actor_t process = nullptr;
-
- xbt_swag_foreach(process, host->process_list) {
- tmp = bprintf("%s\n\t%s", msg, process->name.c_str());
- free(msg);
- msg = tmp;
- }
- SIMIX_display_process_status();
- THROWF(arg_error, 0, "%s", msg);
- }
- xbt_dynar_free(&host->auto_restart_processes);
- xbt_dynar_free(&host->boot_processes);
- xbt_swag_free(host->process_list);
-
- /* Clean host structure */
- delete host;
-}
-
sg_host_t SIMIX_host_self()
{
smx_actor_t process = SIMIX_process_self();
*/
void SIMIX_host_add_auto_restart_process(
sg_host_t host, const char *name, std::function<void()> code,
- void* data, const char *hostname, double kill_time,
- xbt_dict_t properties, int auto_restart)
+ void* data, double kill_time, xbt_dict_t properties, int auto_restart)
{
- if (!sg_host_simix(host)->auto_restart_processes) {
- sg_host_simix(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg);
- }
smx_process_arg_t arg = new simgrid::simix::ProcessArg();
arg->name = name;
arg->code = std::move(code);
arg->data = data;
- arg->hostname = hostname;
+ arg->host = host;
arg->kill_time = kill_time;
arg->properties = properties;
arg->auto_restart = auto_restart;
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));
}
- xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg);
+ sg_host_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)
{
- unsigned int cpt;
- smx_process_arg_t arg;
- xbt_dynar_t process_list = sg_host_simix(host)->auto_restart_processes;
- if (!process_list)
+ std::vector<simgrid::simix::ProcessArg*> process_list = sg_host_simix(host)->auto_restart_processes;
+ if (process_list.empty())
return;
- xbt_dynar_foreach (process_list, cpt, arg) {
+ for (auto arg : process_list) {
- XBT_DEBUG("Restarting Process %s(%s) right now", arg->name.c_str(), arg->hostname);
- if (simix_global->create_process_function) {
- simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->hostname, arg->kill_time,
- arg->properties, arg->auto_restart, nullptr);
- } else {
- simcall_process_create(arg->name.c_str(), arg->code, nullptr, arg->hostname, arg->kill_time, arg->properties,
- arg->auto_restart);
- }
+ XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->name().c_str());
+ simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->kill_time,
+ arg->properties, arg->auto_restart, nullptr);
}
- xbt_dynar_reset(process_list);
+ process_list.clear();
}
smx_activity_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount,