#include "xbt/dict.h"
#include "mc/mc.h"
#include "src/mc/mc_replay.h"
+#include "src/surf/host_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
"SIMIX hosts");
xbt_assert((host != NULL), "Invalid parameters");
- if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_OFF) {
- surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_ON);
+ if (h->isOff()) {
+ simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ surf_host_turn_on(surf_host);
unsigned int cpt;
smx_process_arg_t arg;
xbt_assert((host != NULL), "Invalid parameters");
- if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_ON) {
- surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_OFF);
+ if (h->isOn()) {
+ simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+ surf_host_turn_off(surf_host);
/* Clean Simulator data */
if (xbt_swag_size(host->process_list) != 0) {
XBT_DEBUG("Killing %s on %s by %s", process->name, sg_host_get_name(process->host), issuer->name);
}
}
+ } else {
+ XBT_INFO("Host %s is already off",h->getName().c_str());
}
}
arg->properties = properties;
arg->auto_restart = auto_restart;
- if( sg_host_get_state(host) == SURF_RESOURCE_OFF
+ if( ! sg_host_is_on(host)
&& !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));
(int)synchro->state);
}
/* check if the host is down */
- if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
+ if (simcall->issuer->host->isOff()) {
simcall->issuer->context->iwannadie = 1;
}
{
if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure
* for parallel tasks too */
- surf_host_get_state(surf_host_resource_priv(synchro->execution.host)) == SURF_RESOURCE_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;
*/
void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params)
{
- /* jump to ws_get_params(). */
- surf_host_get_params(ind_vm, params);
+ ind_vm->extension<simgrid::surf::Host>()->getParams(params);
}
void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params)
{
- /* jump to ws_set_params(). */
- surf_host_set_params(ind_vm, params);
+ ind_vm->extension<simgrid::surf::Host>()->setParams(params);
}
-xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host){
+xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host)
+{
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_host_get_mounted_storage_list(host);
+ return host->extension<simgrid::surf::Host>()->getMountedStorageList();
}
-xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host){
+xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host)
+{
xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
- return surf_host_get_attached_storage_list(host);
+ return host->extension<simgrid::surf::Host>()->getAttachedStorageList();
}