#include "src/surf/virtual_machine.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/synchro/SynchroExec.hpp"
-#include "src/synchro/SynchroComm.hpp"
+#include "src/kernel/activity/SynchroExec.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
-/** @brief Internal function to create a SIMIX host. */
-void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter
-{
- smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1);
-
- /* Host structure */
- simgrid::simix::Process proc;
- smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
+namespace simgrid {
+ namespace simix {
+ simgrid::xbt::Extension<simgrid::s4u::Host, Host> Host::EXTENSION_ID;
- /* Update global variables */
- sg_host_simix_set(host, smx_host);
-}
+ Host::Host()
+ {
+ if (!Host::EXTENSION_ID.valid())
+ Host::EXTENSION_ID = s4u::Host::extension_create<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");
+ simgrid::simix::ActorImpl act;
+ process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup));
+ }
- if (h->isOff()) {
- simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
- surf_host->turnOn();
+ 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);
+ }
- 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_process_t issuer)
+void SIMIX_host_off(sg_host_t h, smx_actor_t issuer)
{
smx_host_priv_t host = sg_host_simix(h);
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_process_t process = nullptr;
+ 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",
}
}
-/**
- * \brief Internal function to destroy a SIMIX host.
- *
- * \param h the host to destroy (a sg_host_t)
- */
-void SIMIX_host_destroy(void *h)
+sg_host_t SIMIX_host_self()
{
- 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_process_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 */
- free(host);
- return;
-}
-
-sg_host_t SIMIX_host_self(void)
-{
- smx_process_t process = SIMIX_process_self();
- return (process == nullptr) ? nullptr : SIMIX_process_get_host(process);
+ 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* SIMIX_host_self_get_name(void)
+const char* SIMIX_host_self_get_name()
{
sg_host_t host = SIMIX_host_self();
if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process)
*/
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_synchro_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount,
- double priority, double bound, unsigned long affinity_mask) {
- return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound,affinity_mask);
+smx_activity_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount,
+ double priority, double bound) {
+ return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound);
}
-smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name, double flops_amount, double priority,
- double bound, unsigned long affinity_mask){
+smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, double flops_amount, double priority,
+ double bound){
/* alloc structures and initialize */
- simgrid::simix::Exec *exec = new simgrid::simix::Exec(name, issuer->host);
+ simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, issuer->host);
/* set surf's action */
if (!MC_is_active() && !MC_record_replay_is_active()) {
if (bound > 0)
static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setBound(bound);
-
- if (affinity_mask != 0) {
- /* just a double check to confirm that this host is the host where this task is running. */
- xbt_assert(exec->host == issuer->host);
- static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)
- ->setAffinity(issuer->host->pimpl_cpu, affinity_mask);
- }
}
XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name.c_str());
return exec;
}
-smx_synchro_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_host_t *host_list, double *flops_amount,
+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){
/* alloc structures and initialize */
- simgrid::simix::Exec *exec = new simgrid::simix::Exec(name, nullptr);
+ simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, nullptr);
/* set surf's synchro */
sg_host_t *host_list_cpy = xbt_new0(sg_host_t, host_nb);
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::surf::VirtualMachine*>(host_list[0]->pimpl_));
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::surf::VirtualMachine*>(host_list[i]->pimpl_));
xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
}
return exec;
}
-void SIMIX_execution_cancel(smx_synchro_t synchro)
+void SIMIX_execution_cancel(smx_activity_t synchro)
{
XBT_DEBUG("Cancel synchro %p", synchro);
- simgrid::simix::Exec *exec = static_cast<simgrid::simix::Exec *>(synchro);
+ simgrid::kernel::activity::Exec *exec = static_cast<simgrid::kernel::activity::Exec *>(synchro);
if (exec->surf_exec)
exec->surf_exec->cancel();
}
-void SIMIX_execution_set_priority(smx_synchro_t synchro, double priority)
+void SIMIX_execution_set_priority(smx_activity_t synchro, double priority)
{
- simgrid::simix::Exec *exec = static_cast<simgrid::simix::Exec *>(synchro);
+ simgrid::kernel::activity::Exec *exec = static_cast<simgrid::kernel::activity::Exec *>(synchro);
if(exec->surf_exec)
exec->surf_exec->setPriority(priority);
}
-void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound)
+void SIMIX_execution_set_bound(smx_activity_t synchro, double bound)
{
- simgrid::simix::Exec *exec = static_cast<simgrid::simix::Exec *>(synchro);
+ simgrid::kernel::activity::Exec *exec = static_cast<simgrid::kernel::activity::Exec *>(synchro);
if(exec->surf_exec)
static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setBound(bound);
}
-void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask)
-{
- simgrid::simix::Exec *exec = static_cast<simgrid::simix::Exec *>(synchro);
- if(exec->surf_exec) {
- /* just a double check to confirm that this host is the host where this task is running. */
- xbt_assert(exec->host == host);
- static_cast<simgrid::surf::CpuAction*>(exec->surf_exec)->setAffinity(host->pimpl_cpu, mask);
- }
-}
-
-void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro)
+void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro)
{
- simgrid::simix::Exec *exec = static_cast<simgrid::simix::Exec *>(synchro);
+ simgrid::kernel::activity::Exec *exec = static_cast<simgrid::kernel::activity::Exec *>(synchro);
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
/* Associate this simcall to the synchro */
SIMIX_execution_finish(exec);
}
-void SIMIX_execution_finish(simgrid::simix::Exec *exec)
+void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec)
{
for (smx_simcall_t simcall : exec->simcalls) {
switch (exec->state) {
exec->unref();
}
-void SIMIX_set_category(smx_synchro_t synchro, const char *category)
+void SIMIX_set_category(smx_activity_t synchro, const char *category)
{
if (synchro->state != SIMIX_RUNNING)
return;
- simgrid::simix::Exec *exec = dynamic_cast<simgrid::simix::Exec *>(synchro);
+ simgrid::kernel::activity::Exec *exec = dynamic_cast<simgrid::kernel::activity::Exec *>(synchro);
if (exec != nullptr) {
exec->surf_exec->setCategory(category);
return;
}
- simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm *>(synchro);
+ simgrid::kernel::activity::Comm *comm = dynamic_cast<simgrid::kernel::activity::Comm *>(synchro);
if (comm != nullptr) {
comm->surf_comm->setCategory(category);
return;
