#include "smx_private.h"
#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
-#include "src/surf/host_interface.hpp"
+#include "src/surf/virtual_machine.hpp"
+#include "src/surf/HostImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
s_smx_process_t proc;
/* Host structure */
- smx_host->process_list =
- xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
+ smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup));
/* Update global variables */
sg_host_simix_set(host, smx_host);
xbt_assert((host != NULL), "Invalid parameters");
if (h->isOff()) {
- simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
surf_host->turnOn();
unsigned int cpt;
}
}
-void simcall_HANDLER_host_off(smx_simcall_t simcall, sg_host_t h)
-{
- SIMIX_host_off(h, simcall->issuer);
-}
-
/**
* \brief Stop the host if it is on
*
xbt_assert((host != NULL), "Invalid parameters");
if (h->isOn()) {
- simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
surf_host->turnOff();
/* Clean Simulator data */
if (host == NULL || SIMIX_process_self() == simix_global->maestro_process)
return "";
- return SIMIX_host_get_name(host);
+ return sg_host_get_name(host);
}
void _SIMIX_host_free_process_arg(void *data)
arg->argv = xbt_new(char*,argc + 1);
- int i;
- for (i = 0; i < argc; i++) {
+ for (int i = 0; i < argc; i++)
arg->argv[i] = xbt_strdup(argv[i]);
- }
arg->argv[argc] = NULL;
arg->properties = properties;
arg->auto_restart = auto_restart;
- if( ! sg_host_is_on(host)
- && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
+ 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,NULL);
- XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
+ 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);
}
/**
* \brief Restart the list of processes that have been registered to the host
*/
-void SIMIX_host_restart_processes(sg_host_t host)
+void SIMIX_host_autorestart(sg_host_t host)
{
unsigned int cpt;
smx_process_arg_t arg;
xbt_dynar_reset(process_list);
}
-void SIMIX_host_autorestart(sg_host_t host)
-{
- if(simix_global->autorestart)
- simix_global->autorestart(host);
- else
- xbt_die("No function for simix_global->autorestart");
-}
-smx_synchro_t simcall_HANDLER_process_execute(smx_simcall_t simcall,
- const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) {
- return SIMIX_process_execute(simcall->issuer, name,flops_amount,priority,bound,affinity_mask);
+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_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
+smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name,
double flops_amount, double priority, double bound, unsigned long affinity_mask){
/* alloc structures and initialize */
/* set surf's action */
if (!MC_is_active() && !MC_record_replay_is_active()) {
- synchro->execution.surf_exec = issuer->host->pimpl_cpu->execute(flops_amount);
+ synchro->execution.surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount);
synchro->execution.surf_exec->setData(synchro);
synchro->execution.surf_exec->setPriority(priority);
return synchro;
}
-smx_synchro_t SIMIX_process_parallel_execute(const char *name,
+smx_synchro_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){
for (i = 0; i < host_nb; i++)
host_list_cpy[i] = host_list[i];
-
- /* FIXME: what happens if host_list contains VMs and PMs. If
- * execute_parallel_task() does not change the state of the model, we can mix
- * them. */
- surf_host_model_t ws_model =
- host_list[0]->extension<simgrid::surf::Host>()->getModel();
+ /* 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));
for (i = 1; i < host_nb; i++) {
- surf_host_model_t ws_model_tmp =
- host_list[i]->extension<simgrid::surf::Host>()->getModel();
- if (ws_model_tmp != ws_model) {
- XBT_CRITICAL("mixing VMs and PMs is not supported");
- DIE_IMPOSSIBLE;
- }
+ bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->extension<simgrid::surf::HostImpl>()));
+ xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
}
/* set surf's synchro */
if (!MC_is_active() && !MC_record_replay_is_active()) {
synchro->execution.surf_exec =
surf_host_model->executeParallelTask(
- host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
+ host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
synchro->execution.surf_exec->setData(synchro);
}
return synchro;
}
-void SIMIX_process_execution_destroy(smx_synchro_t synchro){
+void SIMIX_execution_destroy(smx_synchro_t synchro)
+{
XBT_DEBUG("Destroy synchro %p", synchro);
if (synchro->execution.surf_exec) {
xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
}
-void SIMIX_process_execution_cancel(smx_synchro_t synchro){
+void SIMIX_execution_cancel(smx_synchro_t synchro)
+{
XBT_DEBUG("Cancel synchro %p", synchro);
if (synchro->execution.surf_exec)
synchro->execution.surf_exec->cancel();
}
-double SIMIX_process_execution_get_remains(smx_synchro_t synchro){
+double SIMIX_execution_get_remains(smx_synchro_t synchro)
+{
double result = 0.0;
if (synchro->state == SIMIX_RUNNING)
- result = surf_action_get_remains(synchro->execution.surf_exec);
+ result = synchro->execution.surf_exec->getRemains();
return result;
}
-e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro){
+e_smx_state_t SIMIX_execution_get_state(smx_synchro_t synchro)
+{
return synchro->state;
}
-void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority){
-
+void SIMIX_execution_set_priority(smx_synchro_t synchro, double priority)
+{
if(synchro->execution.surf_exec)
- synchro->execution.surf_exec->setPriority(priority);
+ synchro->execution.surf_exec->setPriority(priority);
}
-void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound){
-
+void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound)
+{
if(synchro->execution.surf_exec)
- static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
- ->setBound(bound);
+ static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)->setBound(bound);
}
-void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
+void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask)
+{
xbt_assert(synchro->type == SIMIX_SYNC_EXECUTE);
if (synchro->execution.surf_exec) {
}
}
-void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro){
+void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro)
+{
XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state);
SIMIX_execution_finish(synchro);
}
-void SIMIX_host_execution_suspend(smx_synchro_t synchro)
+void SIMIX_execution_suspend(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
synchro->execution.surf_exec->suspend();
}
-void SIMIX_host_execution_resume(smx_synchro_t synchro)
+void SIMIX_execution_resume(smx_synchro_t synchro)
{
if(synchro->execution.surf_exec)
synchro->execution.surf_exec->resume();
}
simcall->issuer->waiting_synchro = NULL;
- simcall_process_execution_wait__set__result(simcall, synchro->state);
+ simcall_execution_wait__set__result(simcall, synchro->state);
SIMIX_simcall_answer(simcall);
}
/* We no longer need it */
- SIMIX_process_execution_destroy(synchro);
+ SIMIX_execution_destroy(synchro);
}
/* If the host running the synchro failed, notice it so that the asking
* process can be killed if it runs on that host itself */
synchro->state = SIMIX_FAILED;
- } else if (synchro->execution.surf_exec->getState() == SURF_ACTION_FAILED) {
+ } else if (synchro->execution.surf_exec->getState() == simgrid::surf::Action::State::failed) {
/* If the host running the synchro didn't fail, then the synchro was
* canceled */
synchro->state = SIMIX_CANCELED;
