A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Remove the --cfg=model-check:1 flag
[simgrid.git]
/
src
/
simix
/
smx_vm.c
diff --git
a/src/simix/smx_vm.c
b/src/simix/smx_vm.c
index
3d9f156
..
401565c
100644
(file)
--- a/
src/simix/smx_vm.c
+++ b/
src/simix/smx_vm.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
4
. The SimGrid Team.
+/* Copyright (c) 2007-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-25,19
+25,19
@@
sg_host_t SIMIX_vm_create(const char *name, sg_host_t ind_phys_host)
/* Create surf associated resource */
surf_vm_model_create(name, ind_phys_host);
/* Create surf associated resource */
surf_vm_model_create(name, ind_phys_host);
-
sg_host_t smx_host = SIMIX_host_create(name, NULL
);
+
SIMIX_host_create(name
);
/* We will be able to register the VM to its physical host, so that we can promptly
* retrieve the list VMs on the physical host. */
/* We will be able to register the VM to its physical host, so that we can promptly
* retrieve the list VMs on the physical host. */
- return s
mx_host
;
+ return s
g_host_by_name(name)
;
}
/* works for VMs and PMs */
static long host_get_ramsize(sg_host_t vm, int *overcommit)
{
}
/* works for VMs and PMs */
static long host_get_ramsize(sg_host_t vm, int *overcommit)
{
- s_
ws
_params_t params;
+ s_
vm
_params_t params;
surf_host_get_params(vm, ¶ms);
if (overcommit)
surf_host_get_params(vm, ¶ms);
if (overcommit)
@@
-196,13
+196,13
@@
void SIMIX_vm_suspend(sg_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);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "VM(%s) is not running", name);
- XBT_DEBUG("suspend VM(%s), where %d processes exist", name, xbt_swag_size(
SIMIX_host_priv
(ind_vm)->process_list));
+ XBT_DEBUG("suspend VM(%s), where %d processes exist", name, xbt_swag_size(
sg_host_simix
(ind_vm)->process_list));
/* jump to vm_ws_suspend. The state will be set. */
surf_vm_suspend(ind_vm);
smx_process_t smx_process, smx_process_safe;
/* jump to vm_ws_suspend. The state will be set. */
surf_vm_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_swag_foreach_safe(smx_process, smx_process_safe,
sg_host_simix
(ind_vm)->process_list) {
XBT_DEBUG("suspend %s", smx_process->name);
SIMIX_process_suspend(smx_process, issuer);
}
XBT_DEBUG("suspend %s", smx_process->name);
SIMIX_process_suspend(smx_process, issuer);
}
@@
-236,13
+236,13
@@
void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer)
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SUSPENDED)
THROWF(vm_error, 0, "VM(%s) was not suspended", name);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SUSPENDED)
THROWF(vm_error, 0, "VM(%s) was not suspended", name);
- XBT_DEBUG("resume VM(%s), where %d processes exist", name, xbt_swag_size(
SIMIX_host_priv
(ind_vm)->process_list));
+ XBT_DEBUG("resume VM(%s), where %d processes exist", name, xbt_swag_size(
sg_host_simix
(ind_vm)->process_list));
/* jump to vm_ws_resume() */
surf_vm_resume(ind_vm);
smx_process_t smx_process, smx_process_safe;
/* jump to vm_ws_resume() */
surf_vm_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) {
+ xbt_swag_foreach_safe(smx_process, smx_process_safe,
sg_host_simix
(ind_vm)->process_list) {
XBT_DEBUG("resume %s", smx_process->name);
SIMIX_process_resume(smx_process, issuer);
}
XBT_DEBUG("resume %s", smx_process->name);
SIMIX_process_resume(smx_process, issuer);
}
@@
-269,13
+269,13
@@
void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer)
THROWF(vm_error, 0, "VM(%s) is not running", name);
THROWF(vm_error, 0, "VM(%s) is not running", name);
- XBT_DEBUG("save VM(%s), where %d processes exist", name, xbt_swag_size(
SIMIX_host_priv
(ind_vm)->process_list));
+ XBT_DEBUG("save VM(%s), where %d processes exist", name, xbt_swag_size(
sg_host_simix
(ind_vm)->process_list));
/* jump to vm_ws_save() */
surf_vm_save(ind_vm);
smx_process_t smx_process, smx_process_safe;
/* jump to vm_ws_save() */
surf_vm_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) {
+ xbt_swag_foreach_safe(smx_process, smx_process_safe,
sg_host_simix
(ind_vm)->process_list) {
XBT_DEBUG("suspend %s", smx_process->name);
SIMIX_process_suspend(smx_process, issuer);
}
XBT_DEBUG("suspend %s", smx_process->name);
SIMIX_process_suspend(smx_process, issuer);
}
@@
-300,13
+300,13
@@
void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer)
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SAVED)
THROWF(vm_error, 0, "VM(%s) was not saved", name);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SAVED)
THROWF(vm_error, 0, "VM(%s) was not saved", name);
- XBT_DEBUG("restore VM(%s), where %d processes exist", name, xbt_swag_size(
SIMIX_host_priv
(ind_vm)->process_list));
+ XBT_DEBUG("restore VM(%s), where %d processes exist", name, xbt_swag_size(
sg_host_simix
(ind_vm)->process_list));
/* jump to vm_ws_restore() */
surf_vm_resume(ind_vm);
smx_process_t smx_process, smx_process_safe;
/* jump to vm_ws_restore() */
surf_vm_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) {
+ xbt_swag_foreach_safe(smx_process, smx_process_safe,
sg_host_simix
(ind_vm)->process_list) {
XBT_DEBUG("resume %s", smx_process->name);
SIMIX_process_resume(smx_process, issuer);
}
XBT_DEBUG("resume %s", smx_process->name);
SIMIX_process_resume(smx_process, issuer);
}
@@
-333,10
+333,10
@@
void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer)
THROWF(vm_error, 0, "VM(%s) is not running", name);
XBT_DEBUG("shutdown %s", name);
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));
+ XBT_DEBUG("%d processes in the VM", xbt_swag_size(
sg_host_simix
(ind_vm)->process_list));
smx_process_t smx_process, smx_process_safe;
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_swag_foreach_safe(smx_process, smx_process_safe,
sg_host_simix
(ind_vm)->process_list) {
XBT_DEBUG("kill %s", smx_process->name);
SIMIX_process_kill(smx_process, issuer);
}
XBT_DEBUG("kill %s", smx_process->name);
SIMIX_process_kill(smx_process, issuer);
}
@@
-367,7
+367,7
@@
void SIMIX_vm_destroy(sg_host_t ind_vm)
XBT_DEBUG("destroy %s", hostname);
/* this will call the registered callback function, i.e., SIMIX_host_destroy(). */
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
);
+
sg_host_simix_destroy(ind_vm
);
/* jump to vm_ws_destroy(). The surf level resource will be freed. */
surf_vm_destroy(ind_vm);
/* jump to vm_ws_destroy(). The surf level resource will be freed. */
surf_vm_destroy(ind_vm);