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
energy: less code dupplication
[simgrid.git]
/
src
/
surf
/
vm_interface.cpp
diff --git
a/src/surf/vm_interface.cpp
b/src/surf/vm_interface.cpp
index
d7b0e5c
..
b50057f
100644
(file)
--- a/
src/surf/vm_interface.cpp
+++ b/
src/surf/vm_interface.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-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
@@
-24,10
+24,6
@@
surf_callback(void, VM*) VMStateChangedCallbacks;
* Model *
*********/
* Model *
*********/
-VMModel::VMModel() : HostModel("Virtual Machine") {
- p_cpuModel = surf_cpu_model_vm;
-}
-
VMModel::vm_list_t VMModel::ws_vms;
/************
VMModel::vm_list_t VMModel::ws_vms;
/************
@@
-43,14
+39,13
@@
VM::VM(Model *model, const char *name, xbt_dict_t props,
}
/*
}
/*
- * A physical host does not disapper in the current SimGrid code, but a VM may
- * disapper during a simulation.
+ * A physical host does not disappe
a
r in the current SimGrid code, but a VM may
+ * disappe
a
r during a simulation.
*/
VM::~VM()
{
surf_callback_emit(VMDestructedCallbacks, this);
*/
VM::~VM()
{
surf_callback_emit(VMDestructedCallbacks, this);
- VMModel::ws_vms.erase(VMModel::
- vm_list_t::s_iterator_to(*this));
+ VMModel::ws_vms.erase(VMModel::vm_list_t::s_iterator_to(*this));
}
void VM::setState(e_surf_resource_state_t state){
}
void VM::setState(e_surf_resource_state_t state){
@@
-59,7
+54,7
@@
void VM::setState(e_surf_resource_state_t state){
}
/*
}
/*
- * A surf level object will be useless in the upper layer. Returing the
+ * A surf level object will be useless in the upper layer. Retur
n
ing the
* dict_elm of the host.
**/
surf_resource_t VM::getPm()
* dict_elm of the host.
**/
surf_resource_t VM::getPm()