#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/virtual_machine.hpp"
-#include "src/surf/host_interface.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->is_off()) {
- simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ if (h->isOff()) {
+ simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
surf_host->turnOn();
unsigned int cpt;
xbt_assert((host != NULL), "Invalid parameters");
- if (h->is_on()) {
- simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ if (h->isOn()) {
+ simgrid::surf::HostImpl* surf_host = h->extension<simgrid::surf::HostImpl>();
surf_host->turnOff();
/* Clean Simulator 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);
}
host_list_cpy[i] = host_list[i];
/* Check that we are not mixing VMs and PMs in the parallel task */
- simgrid::surf::Host *host = host_list[0]->extension<simgrid::surf::Host>();
+ 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++) {
- bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::surf::VirtualMachine*>(host_list[i]->extension<simgrid::surf::Host>()));
+ 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).");
}
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;
}
(int)synchro->state);
}
/* check if the host is down */
- if (simcall->issuer->host->is_off()) {
+ if (simcall->issuer->host->isOff()) {
simcall->issuer->context->iwannadie = 1;
}
{
if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure
* for parallel tasks too */
- synchro->execution.host->is_off()) {
+ synchro->execution.host->isOff()) {
/* 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;