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
New functions: xbt_str_parse_int / xbt_str_parse_double
[simgrid.git]
/
src
/
simix
/
smx_vm.cpp
diff --git
a/src/simix/smx_vm.cpp
b/src/simix/smx_vm.cpp
index
6be0a15
..
69088f1
100644
(file)
--- a/
src/simix/smx_vm.cpp
+++ b/
src/simix/smx_vm.cpp
@@
-87,7
+87,7
@@
static int __can_be_started(sg_host_t vm)
}
xbt_dynar_free(&dyn_vms);
}
xbt_dynar_free(&dyn_vms);
-
return 1;
+ return 1;
}
void SIMIX_vm_start(sg_host_t ind_vm)
}
void SIMIX_vm_start(sg_host_t ind_vm)
@@
-97,7
+97,7
@@
void SIMIX_vm_start(sg_host_t ind_vm)
ind_vm->extension<simgrid::surf::Host>()
)->setState(SURF_VM_STATE_RUNNING);
else
ind_vm->extension<simgrid::surf::Host>()
)->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));
}
}
@@
-197,7
+197,7
@@
void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mas
*/
void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer)
{
*/
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);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "VM(%s) is not running", name);
@@
-237,7
+237,7
@@
void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, sg_host_t ind_vm)
*/
void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer)
{
*/
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);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SUSPENDED)
THROWF(vm_error, 0, "VM(%s) was not suspended", name);
@@
-269,7
+269,7
@@
void simcall_HANDLER_vm_resume(smx_simcall_t simcall, sg_host_t ind_vm)
*/
void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer)
{
*/
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);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "VM(%s) is not running", name);
@@
-301,7
+301,7
@@
void simcall_HANDLER_vm_save(smx_simcall_t simcall, sg_host_t ind_vm)
*/
void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer)
{
*/
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);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_SAVED)
THROWF(vm_error, 0, "VM(%s) was not saved", name);
@@
-333,7
+333,7
@@
void simcall_HANDLER_vm_restore(smx_simcall_t simcall, sg_host_t ind_vm)
*/
void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer)
{
*/
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);
if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
THROWF(vm_error, 0, "VM(%s) is not running", name);
@@
-368,8
+368,7
@@
void SIMIX_vm_destroy(sg_host_t ind_vm)
{
/* this code basically performs a similar thing like SIMIX_host_destroy() */
{
/* 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);
XBT_DEBUG("destroy %s", hostname);