X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..680d3333804979cca617afe9bef76ab1b1eb9f0e:/src/simix/smx_vm.c diff --git a/src/simix/smx_vm.c b/src/simix/smx_vm.c index 9f1e0b54a4..d2eab043aa 100644 --- a/src/simix/smx_vm.c +++ b/src/simix/smx_vm.c @@ -34,12 +34,6 @@ smx_host_t SIMIX_vm_create(const char *name, smx_host_t ind_phys_host) } -smx_host_t SIMIX_pre_vm_create(smx_simcall_t simcall, const char *name, smx_host_t ind_phys_host) -{ - return SIMIX_vm_create(name, ind_phys_host); -} - - /* works for VMs and PMs */ static long host_get_ramsize(smx_host_t vm, int *overcommit) { @@ -96,62 +90,32 @@ 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)); } - -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_resource_set_state(surf_workstation_resource_priv(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_resource_get_state(surf_workstation_resource_priv(ind_vm)); } -int SIMIX_pre_vm_get_state(smx_simcall_t simcall, smx_host_t ind_vm) -{ - return SIMIX_vm_get_state(ind_vm); -} - - /** - * \brief Function to migrate a SIMIX VM host. + * \brief Function to migrate a SIMIX VM host. * * \param host the vm host to migrate (a smx_host_t) */ void SIMIX_vm_migrate(smx_host_t ind_vm, smx_host_t ind_dst_pm) { /* precopy migration makes the VM temporally paused */ - e_surf_vm_state_t state = SIMIX_vm_get_state(ind_vm); - xbt_assert(state == SURF_VM_STATE_SUSPENDED); + xbt_assert(SIMIX_vm_get_state(ind_vm) == SURF_VM_STATE_SUSPENDED); - /* jump to vm_ws_migrate(). this will update the vm location. */ + /* jump to vm_ws_xigrate(). this will update the vm location. */ 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) -{ - SIMIX_vm_migrate(ind_vm, ind_dst_pm); -} - - /** * \brief Function to get the physical host of the given SIMIX VM host. * @@ -163,12 +127,6 @@ void *SIMIX_vm_get_pm(smx_host_t 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) -{ - return SIMIX_vm_get_pm(ind_vm); -} - - /** * \brief Function to set the CPU bound of the given SIMIX VM host. * @@ -181,12 +139,6 @@ void SIMIX_vm_set_bound(smx_host_t ind_vm, double 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) -{ - SIMIX_vm_set_bound(ind_vm, bound); -} - - /** * \brief Function to set the CPU affinity of the given SIMIX VM host. * @@ -203,14 +155,9 @@ void SIMIX_vm_set_affinity(smx_host_t ind_vm, smx_host_t ind_pm, unsigned long m 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) -{ - SIMIX_vm_set_affinity(ind_vm, ind_pm, mask); -} - /** - * \brief Function to suspend a SIMIX VM host. This function stops the exection of the + * \brief Function to suspend a SIMIX VM host. This function stops the execution of the * VM. All the processes on this VM will pause. The state of the VM is * preserved on memory. We can later resume it again. * @@ -237,7 +184,7 @@ void SIMIX_vm_suspend(smx_host_t ind_vm, smx_process_t issuer) XBT_DEBUG("suspend all processes on the VM done done"); } -void SIMIX_pre_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm) +void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm) { if (simcall->issuer->smx_host == ind_vm) { XBT_ERROR("cannot suspend the VM where I run"); @@ -246,13 +193,13 @@ void SIMIX_pre_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm) SIMIX_vm_suspend(ind_vm, simcall->issuer); - XBT_DEBUG("SIMIX_pre_vm_suspend done"); + XBT_DEBUG("simcall_HANDLER_vm_suspend done"); } /** * \brief Function to resume a SIMIX VM host. This function restart the execution of the - * VM. All the processes on this VM will run again. + * VM. All the processes on this VM will run again. * * \param host the vm host to resume (a smx_host_t) */ @@ -275,7 +222,7 @@ void SIMIX_vm_resume(smx_host_t ind_vm, smx_process_t issuer) } } -void SIMIX_pre_vm_resume(smx_simcall_t simcall, smx_host_t ind_vm) +void simcall_HANDLER_vm_resume(smx_simcall_t simcall, smx_host_t ind_vm) { SIMIX_vm_resume(ind_vm, simcall->issuer); } @@ -308,7 +255,7 @@ void SIMIX_vm_save(smx_host_t ind_vm, smx_process_t issuer) } } -void SIMIX_pre_vm_save(smx_simcall_t simcall, smx_host_t ind_vm) +void simcall_HANDLER_vm_save(smx_simcall_t simcall, smx_host_t ind_vm) { SIMIX_vm_save(ind_vm, simcall->issuer); } @@ -316,7 +263,7 @@ void SIMIX_pre_vm_save(smx_simcall_t simcall, smx_host_t ind_vm) /** * \brief Function to restore a SIMIX VM host. This function restart the execution of the - * VM. All the processes on this VM will run again. + * VM. All the processes on this VM will run again. * * \param host the vm host to restore (a smx_host_t) */ @@ -339,7 +286,7 @@ void SIMIX_vm_restore(smx_host_t ind_vm, smx_process_t issuer) } } -void SIMIX_pre_vm_restore(smx_simcall_t simcall, smx_host_t ind_vm) +void simcall_HANDLER_vm_restore(smx_simcall_t simcall, smx_host_t ind_vm) { SIMIX_vm_restore(ind_vm, simcall->issuer); } @@ -359,19 +306,21 @@ 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) +void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm) { SIMIX_vm_shutdown(ind_vm, simcall->issuer); } @@ -389,14 +338,11 @@ 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_destroy(ind_vm); } - -void SIMIX_pre_vm_destroy(smx_simcall_t simcall, smx_host_t ind_vm) -{ - SIMIX_vm_destroy(ind_vm); -}