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
Update copyright headers.
[simgrid.git]
/
src
/
plugins
/
vm
/
VirtualMachineImpl.hpp
diff --git
a/src/plugins/vm/VirtualMachineImpl.hpp
b/src/plugins/vm/VirtualMachineImpl.hpp
index
553fffa
..
362409a
100644
(file)
--- a/
src/plugins/vm/VirtualMachineImpl.hpp
+++ b/
src/plugins/vm/VirtualMachineImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
8
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-16,8
+16,6
@@
#define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
// It corresponds to the cost of a VM running no tasks.
#define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
// It corresponds to the cost of a VM running no tasks.
-typedef struct s_dirty_page* dirty_page_t;
-
namespace simgrid {
namespace vm {
namespace simgrid {
namespace vm {
@@
-29,8
+27,7
@@
namespace vm {
* @brief SURF VM interface class
* @details A VM represent a virtual machine
*/
* @brief SURF VM interface class
* @details A VM represent a virtual machine
*/
-XBT_PUBLIC_CLASS VirtualMachineImpl : public surf::HostImpl, public simgrid::xbt::Extendable<VirtualMachineImpl>
-{
+class XBT_PUBLIC VirtualMachineImpl : public surf::HostImpl, public simgrid::xbt::Extendable<VirtualMachineImpl> {
friend simgrid::s4u::VirtualMachine;
public:
friend simgrid::s4u::VirtualMachine;
public:
@@
-38,13
+35,13
@@
public:
~VirtualMachineImpl();
/** @brief Suspend the VM */
~VirtualMachineImpl();
/** @brief Suspend the VM */
- virtual void suspend(simgrid::
simix
::ActorImpl* issuer);
+ virtual void suspend(simgrid::
kernel::actor
::ActorImpl* issuer);
/** @brief Resume the VM */
virtual void resume();
/** @brief Shutdown the VM */
/** @brief Resume the VM */
virtual void resume();
/** @brief Shutdown the VM */
- virtual void shutdown(simgrid::
simix
::ActorImpl* issuer);
+ virtual void shutdown(simgrid::
kernel::actor
::ActorImpl* issuer);
/** @brief Change the physical host on which the given VM is running */
virtual void setPm(s4u::Host* dest);
/** @brief Change the physical host on which the given VM is running */
virtual void setPm(s4u::Host* dest);
@@
-57,11
+54,8
@@
public:
virtual void setBound(double bound);
virtual void setBound(double bound);
- void getParams(vm_params_t params);
- void setParams(vm_params_t params);
-
/* The vm object of the lower layer */
/* The vm object of the lower layer */
-
surf
::Action* action_ = nullptr;
+
kernel::resource
::Action* action_ = nullptr;
e_surf_vm_state_t getState();
void setState(e_surf_vm_state_t state);
e_surf_vm_state_t getState();
void setState(e_surf_vm_state_t state);
@@
-89,7
+83,6
@@
public:
private:
simgrid::s4u::Host* hostPM_;
private:
simgrid::s4u::Host* hostPM_;
- s_vm_params_t params_;
int coreAmount_;
size_t ramsize_ = 0;
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
int coreAmount_;
size_t ramsize_ = 0;
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
@@
-105,14
+98,14
@@
private:
class XBT_PRIVATE VMModel : public surf::HostModel {
public:
VMModel();
class XBT_PRIVATE VMModel : public surf::HostModel {
public:
VMModel();
- void ignore
EmptyVmInPm
LMM() override{};
+ void ignore
_empty_vm_in_pm_
LMM() override{};
- double next
OccuringE
vent(double now) override;
- void update
ActionsS
tate(double /*now*/, double /*delta*/) override{};
+ double next
_occuring_e
vent(double now) override;
+ void update
_actions_s
tate(double /*now*/, double /*delta*/) override{};
};
}
}
};
}
}
-XBT_PUBLIC_DATA
(simgrid::vm::VMModel*)
surf_vm_model;
+XBT_PUBLIC_DATA
simgrid::vm::VMModel*
surf_vm_model;
#endif /* VM_INTERFACE_HPP_ */
#endif /* VM_INTERFACE_HPP_ */