/* 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 <xbt/ex.hpp>
-#include "xbt/sysdep.h"
#include "mc/mc.h"
+#include "smx_private.h"
#include "src/mc/mc_replay.h"
-#include "src/surf/virtual_machine.hpp"
+#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"
Host::Host()
{
- if (!EXTENSION_ID.valid())
- EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::simix::Host>();
+ if (!Host::EXTENSION_ID.valid())
+ Host::EXTENSION_ID = s4u::Host::extension_create<simix::Host>();
simgrid::simix::ActorImpl act;
process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
SIMIX_display_process_status();
THROWF(arg_error, 0, "%s", msg);
}
- xbt_dynar_free(&auto_restart_processes);
- xbt_dynar_free(&boot_processes);
+ 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);
}
*/
void Host::turnOn()
{
- unsigned int cpt;
- smx_process_arg_t arg;
- xbt_dynar_foreach(boot_processes,cpt,arg) {
- XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->hostname);
- // FIXME: factorize this code by registering the simcall as default function
- 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);
- }
+ 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->host,
+ arg->kill_time,
+ arg->properties,
+ arg->auto_restart,
+ nullptr);
}
}
xbt_assert((host != nullptr), "Invalid parameters");
if (h->isOn()) {
- simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
- surf_host->turnOff();
+ h->pimpl_cpu->turnOff();
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
smx_actor_t process = nullptr;
xbt_swag_foreach(process, host->process_list) {
SIMIX_process_kill(process, issuer);
- XBT_DEBUG("Killing %s on %s by %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->name.c_str(), sg_host_get_name(process->host),
+ issuer->name.c_str());
}
}
} else {
*/
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,
return exec;
}
-smx_activity_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_host_t *host_list, double *flops_amount,
- double *bytes_amount, double amount, double rate){
+smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
+ double* bytes_amount, double amount, double rate, double timeout)
+{
/* alloc structures and initialize */
simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, nullptr);
host_list_cpy[i] = host_list[i];
/* Check that we are not mixing VMs and PMs in the parallel task */
- simgrid::surf::HostImpl *host = host_list[0]->extension<simgrid::surf::HostImpl>();
- bool is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host));
+ bool is_a_vm = (nullptr != dynamic_cast<simgrid::s4u::VirtualMachine*>(host_list[0]));
for (int i = 1; i < host_nb; i++) {
- bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->extension<simgrid::surf::HostImpl>()));
+ bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::s4u::VirtualMachine*>(host_list[i]));
xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
}
if (!MC_is_active() && !MC_record_replay_is_active()) {
exec->surf_exec = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
exec->surf_exec->setData(exec);
+ if (timeout > 0) {
+ exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout);
+ exec->timeoutDetector->setData(exec);
+ }
}
XBT_DEBUG("Create parallel execute synchro %p", exec);
SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled");
break;
+ case SIMIX_TIMEOUT:
+ XBT_DEBUG("SIMIX_execution_finished: execution timeouted");
+ SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Timeouted");
+ break;
+
default:
xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d",
(int)exec->state);
