X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8751ce2fc793fff5b7b5f492add834d9f77ec0e3..662f44287e3fd62ebdf93b4c8173603dde9693b7:/src/simix/smx_vm.c diff --git a/src/simix/smx_vm.c b/src/simix/smx_vm.c index c7802adfc3..091e92ac80 100644 --- a/src/simix/smx_vm.c +++ b/src/simix/smx_vm.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2012. The SimGrid Team. +/* Copyright (c) 2007-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX (vms smx_host_t SIMIX_vm_create(const char *name, smx_host_t ind_phys_host) { /* Create surf associated resource */ - surf_vm_workstation_model->extension.vm_workstation.create(name, ind_phys_host); + surf_vm_workstation_model_create(name, ind_phys_host); smx_host_t smx_host = SIMIX_host_create(name, ind_phys_host, NULL); @@ -44,7 +44,7 @@ smx_host_t SIMIX_pre_vm_create(smx_simcall_t simcall, const char *name, smx_host static long host_get_ramsize(smx_host_t vm, int *overcommit) { s_ws_params_t params; - surf_workstation_model->extension.workstation.get_params(vm, ¶ms); + surf_workstation_get_params(vm, ¶ms); if (overcommit) *overcommit = params.overcommit; @@ -55,7 +55,7 @@ static long host_get_ramsize(smx_host_t vm, int *overcommit) /* **** start a VM **** */ static int __can_be_started(smx_host_t vm) { - smx_host_t pm = surf_vm_workstation_model->extension.vm_workstation.get_pm(vm); + smx_host_t pm = surf_vm_workstation_get_pm(vm); int pm_overcommit = 0; long pm_ramsize = host_get_ramsize(pm, &pm_overcommit); @@ -72,7 +72,7 @@ static int __can_be_started(smx_host_t vm) } long total_ramsize_of_vms = 0; - xbt_dynar_t dyn_vms = surf_workstation_model->extension.workstation.get_vms(pm); + xbt_dynar_t dyn_vms = surf_workstation_get_vms(pm); { unsigned int cursor = 0; smx_host_t another_vm; @@ -96,7 +96,8 @@ static int __can_be_started(smx_host_t vm) void SIMIX_vm_start(smx_host_t ind_vm) { if (__can_be_started(ind_vm)) - SIMIX_vm_set_state(ind_vm, SURF_VM_STATE_RUNNING); + surf_resource_set_state(surf_workstation_resource_priv(ind_vm), + (int)SURF_VM_STATE_RUNNING); else THROWF(vm_error, 0, "The VM %s cannot be started", SIMIX_host_get_name(ind_vm)); } @@ -108,21 +109,9 @@ void SIMIX_pre_vm_start(smx_simcall_t simcall, smx_host_t ind_vm) SIMIX_vm_start(ind_vm); } -/* ***** set/get state of a VM ***** */ -void SIMIX_vm_set_state(smx_host_t ind_vm, int state) -{ - /* jump to vm_ws_set_state */ - surf_vm_workstation_model->extension.vm_workstation.set_state(ind_vm, state); -} - -void SIMIX_pre_vm_set_state(smx_simcall_t simcall, smx_host_t ind_vm, int state) -{ - SIMIX_vm_set_state(ind_vm, state); -} - int SIMIX_vm_get_state(smx_host_t ind_vm) { - return surf_vm_workstation_model->extension.vm_workstation.get_state(ind_vm); + return surf_resource_get_state(surf_workstation_resource_priv(ind_vm)); } int SIMIX_pre_vm_get_state(smx_simcall_t simcall, smx_host_t ind_vm) @@ -143,7 +132,7 @@ void SIMIX_vm_migrate(smx_host_t ind_vm, smx_host_t ind_dst_pm) xbt_assert(state == SURF_VM_STATE_SUSPENDED); /* jump to vm_ws_migrate(). this will update the vm location. */ - surf_vm_workstation_model->extension.vm_workstation.migrate(ind_vm, ind_dst_pm); + surf_vm_workstation_migrate(ind_vm, ind_dst_pm); } void SIMIX_pre_vm_migrate(smx_simcall_t simcall, smx_host_t ind_vm, smx_host_t ind_dst_pm) @@ -160,7 +149,7 @@ void SIMIX_pre_vm_migrate(smx_simcall_t simcall, smx_host_t ind_vm, smx_host_t i void *SIMIX_vm_get_pm(smx_host_t ind_vm) { /* jump to vm_ws_get_pm(). this will return the vm name. */ - return surf_vm_workstation_model->extension.vm_workstation.get_pm(ind_vm); + return surf_vm_workstation_get_pm(ind_vm); } void *SIMIX_pre_vm_get_pm(smx_simcall_t simcall, smx_host_t ind_vm) @@ -178,7 +167,7 @@ void *SIMIX_pre_vm_get_pm(smx_simcall_t simcall, smx_host_t ind_vm) void SIMIX_vm_set_bound(smx_host_t ind_vm, double bound) { /* jump to vm_ws_set_vm_bound(). */ - surf_vm_workstation_model->extension.vm_workstation.set_vm_bound(ind_vm, bound); + surf_vm_workstation_set_bound(ind_vm, bound); } void SIMIX_pre_vm_set_bound(smx_simcall_t simcall, smx_host_t ind_vm, double bound) @@ -196,8 +185,11 @@ void SIMIX_pre_vm_set_bound(smx_simcall_t simcall, smx_host_t ind_vm, double bou */ void SIMIX_vm_set_affinity(smx_host_t ind_vm, smx_host_t ind_pm, unsigned long mask) { + /* make sure this at the MSG layer. */ + xbt_assert(SIMIX_vm_get_pm(ind_vm) == ind_pm); + /* jump to vm_ws_set_vm_affinity(). */ - surf_vm_workstation_model->extension.vm_workstation.set_vm_affinity(ind_vm, ind_pm, mask); + surf_vm_workstation_set_affinity(ind_vm, ind_pm, mask); } void SIMIX_pre_vm_set_affinity(smx_simcall_t simcall, smx_host_t ind_vm, smx_host_t ind_pm, unsigned long mask) @@ -223,7 +215,7 @@ void SIMIX_vm_suspend(smx_host_t ind_vm, smx_process_t issuer) XBT_DEBUG("suspend VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list)); /* jump to vm_ws_suspend. The state will be set. */ - surf_vm_workstation_model->extension.vm_workstation.suspend(ind_vm); + surf_vm_workstation_suspend(ind_vm); smx_process_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) { @@ -263,7 +255,7 @@ void SIMIX_vm_resume(smx_host_t ind_vm, smx_process_t issuer) XBT_DEBUG("resume VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list)); /* jump to vm_ws_resume() */ - surf_vm_workstation_model->extension.vm_workstation.resume(ind_vm); + surf_vm_workstation_resume(ind_vm); smx_process_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) { @@ -296,7 +288,7 @@ void SIMIX_vm_save(smx_host_t ind_vm, smx_process_t issuer) XBT_DEBUG("save VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list)); /* jump to vm_ws_save() */ - surf_vm_workstation_model->extension.vm_workstation.save(ind_vm); + surf_vm_workstation_save(ind_vm); smx_process_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) { @@ -327,7 +319,7 @@ void SIMIX_vm_restore(smx_host_t ind_vm, smx_process_t issuer) XBT_DEBUG("restore VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list)); /* jump to vm_ws_restore() */ - surf_vm_workstation_model->extension.vm_workstation.resume(ind_vm); + surf_vm_workstation_resume(ind_vm); smx_process_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) { @@ -356,16 +348,18 @@ void SIMIX_vm_shutdown(smx_host_t ind_vm, smx_process_t issuer) if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING) THROWF(vm_error, 0, "VM(%s) is not running", name); + XBT_DEBUG("shutdown %s", name); XBT_DEBUG("%d processes in the VM", xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list)); smx_process_t smx_process, smx_process_safe; xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) { - XBT_DEBUG("shutdown %s", name); + XBT_DEBUG("kill %s", smx_process->name); SIMIX_process_kill(smx_process, issuer); } /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */ - SIMIX_vm_set_state(ind_vm, SURF_VM_STATE_CREATED); + surf_resource_set_state(surf_workstation_resource_priv(ind_vm), + (int)SURF_VM_STATE_CREATED); } void SIMIX_pre_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm) @@ -386,11 +380,13 @@ void SIMIX_vm_destroy(smx_host_t ind_vm) xbt_assert((ind_vm != NULL), "Invalid parameters"); const char *hostname = SIMIX_host_get_name(ind_vm); + XBT_DEBUG("destroy %s", hostname); + /* this will call the registered callback function, i.e., SIMIX_host_destroy(). */ xbt_lib_unset(host_lib, hostname, SIMIX_HOST_LEVEL, 1); /* jump to vm_ws_destroy(). The surf level resource will be freed. */ - surf_vm_workstation_model->extension.vm_workstation.destroy(ind_vm); + surf_vm_workstation_destroy(ind_vm); } void SIMIX_pre_vm_destroy(smx_simcall_t simcall, smx_host_t ind_vm)