* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
#include "mc/mc.h"
-#include "src/surf/host_interface.hpp"
+#include "src/surf/virtual_machine.hpp"
+#include "src/surf/HostImpl.hpp"
//If you need to log some stuffs, just uncomment these two lines and uses XBT_DEBUG for instance
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX (vms)");
static long host_get_ramsize(sg_host_t vm, int *overcommit)
{
s_vm_params_t params;
- surf_host_get_params(vm, ¶ms);
+ vm->extension<simgrid::surf::HostImpl>()->getParams(¶ms);
if (overcommit)
*overcommit = params.overcommit;
}
if (pm_overcommit) {
- XBT_INFO("%s allows memory overcommit.", sg_host_get_name(pm));
+ XBT_VERB("%s allows memory overcommit.", sg_host_get_name(pm));
return 1;
}
long total_ramsize_of_vms = 0;
- xbt_dynar_t dyn_vms = surf_host_get_vms(pm);
+ xbt_dynar_t dyn_vms = pm->extension<simgrid::surf::HostImpl>()->getVms();
{
unsigned int cursor = 0;
sg_host_t another_vm;
return 0;
}
- xbt_dynar_free(&dyn_vms);
- return 1;
+ return 1;
}
void SIMIX_vm_start(sg_host_t ind_vm)
{
if (__can_be_started(ind_vm))
- surf_host_set_state(surf_host_resource_priv(ind_vm),
- (e_surf_resource_state_t) SURF_VM_STATE_RUNNING);
+ static_cast<simgrid::surf::VirtualMachine*>(
+ ind_vm->extension<simgrid::surf::HostImpl>()
+ )->setState(SURF_VM_STATE_RUNNING);
else
- THROWF(vm_error, 0, "The VM %s cannot be started", SIMIX_host_get_name(ind_vm));
+ THROWF(vm_error, 0, "The VM %s cannot be started", sg_host_get_name(ind_vm));
}
-int SIMIX_vm_get_state(sg_host_t ind_vm)
+e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t ind_vm)
{
- return surf_host_resource_priv(ind_vm)->getState();
+ return static_cast<simgrid::surf::VirtualMachine*>(
+ ind_vm->extension<simgrid::surf::HostImpl>()
+ )->getState();
}
/**
*/
void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer)
{
- const char *name = SIMIX_host_get_name(ind_vm);
+ const char *name = sg_host_get_name(ind_vm);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "VM(%s) is not running", name);
*/
void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer)
{
- const char *name = SIMIX_host_get_name(ind_vm);
+ const char *name = sg_host_get_name(ind_vm);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SUSPENDED)
THROWF(vm_error, 0, "VM(%s) was not suspended", name);
*/
void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer)
{
- const char *name = SIMIX_host_get_name(ind_vm);
+ const char *name = sg_host_get_name(ind_vm);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "VM(%s) is not running", name);
*/
void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer)
{
- const char *name = SIMIX_host_get_name(ind_vm);
+ const char *name = sg_host_get_name(ind_vm);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SAVED)
THROWF(vm_error, 0, "VM(%s) was not saved", name);
*/
void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer)
{
- const char *name = SIMIX_host_get_name(ind_vm);
+ const char *name = sg_host_get_name(ind_vm);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "VM(%s) is not running", name);
}
/* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
- surf_host_set_state(surf_host_resource_priv(ind_vm),
- (e_surf_resource_state_t) SURF_VM_STATE_CREATED);
+ static_cast<simgrid::surf::VirtualMachine*>(
+ ind_vm->extension<simgrid::surf::HostImpl>()
+ )->setState(SURF_VM_STATE_CREATED);
}
void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, sg_host_t ind_vm)
{
/* this code basically performs a similar thing like SIMIX_host_destroy() */
- xbt_assert((ind_vm != NULL), "Invalid parameters");
- const char *hostname = SIMIX_host_get_name(ind_vm);
+ const char *hostname = sg_host_get_name(ind_vm);
XBT_DEBUG("destroy %s", hostname);