-/* 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
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);
}
-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)
{
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;
/* **** 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);
}
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;
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);
- SIMIX_simcall_answer(simcall);
-}
-
-/* ***** 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)
-{
- 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. */
- surf_vm_workstation_model->extension.vm_workstation.migrate(ind_vm, ind_dst_pm);
+ /* 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);
- SIMIX_simcall_answer(simcall);
-}
-
-
/**
* \brief Function to get the physical host of the given SIMIX VM host.
*
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)
-{
- return SIMIX_vm_get_pm(ind_vm);
-}
-
-
/**
* \brief Function to set the CPU bound of the given SIMIX VM host.
*
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)
+/**
+ * \brief Function to set the CPU affinity of the given SIMIX VM host.
+ *
+ * \param host the vm host (a smx_host_t)
+ * \param host the pm host (a smx_host_t)
+ * \param mask affinity mask (a unsigned long)
+ */
+void SIMIX_vm_set_affinity(smx_host_t ind_vm, smx_host_t ind_pm, unsigned long mask)
{
- SIMIX_vm_set_bound(ind_vm, bound);
- SIMIX_simcall_answer(simcall);
+ /* 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_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.
*
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) {
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");
SIMIX_vm_suspend(ind_vm, simcall->issuer);
- /* without this, simcall_vm_suspend() does not return to the userland. why? */
- SIMIX_simcall_answer(simcall);
-
- 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)
*/
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) {
}
}
-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);
- SIMIX_simcall_answer(simcall);
}
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) {
}
}
-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);
-
- /* without this, simcall_vm_suspend() does not return to the userland. why? */
- SIMIX_simcall_answer(simcall);
}
/**
* \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)
*/
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) {
}
}
-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);
- SIMIX_simcall_answer(simcall);
}
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);
- SIMIX_simcall_answer(simcall);
}
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);
-}
-
-void SIMIX_pre_vm_destroy(smx_simcall_t simcall, smx_host_t ind_vm)
-{
- SIMIX_vm_destroy(ind_vm);
- SIMIX_simcall_answer(simcall);
+ surf_vm_workstation_destroy(ind_vm);
}
