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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
simgrid
/
s4u
/
VirtualMachine.hpp
diff --git
a/include/simgrid/s4u/VirtualMachine.hpp
b/include/simgrid/s4u/VirtualMachine.hpp
index
d455e56
..
89063d5
100644
(file)
--- a/
include/simgrid/s4u/VirtualMachine.hpp
+++ b/
include/simgrid/s4u/VirtualMachine.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-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. */
@@
-6,9
+6,8
@@
#ifndef SIMGRID_S4U_VM_HPP
#define SIMGRID_S4U_VM_HPP
#ifndef SIMGRID_S4U_VM_HPP
#define SIMGRID_S4U_VM_HPP
-#include "simgrid/datatypes.h"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/forward.hpp"
+#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/forward.hpp>
enum e_surf_vm_state_t {
SURF_VM_STATE_CREATED, /**< created, but not yet started */
enum e_surf_vm_state_t {
SURF_VM_STATE_CREATED, /**< created, but not yet started */
@@
-21,6
+20,7
@@
namespace simgrid {
namespace vm {
class VirtualMachineImpl;
};
namespace vm {
class VirtualMachineImpl;
};
+
namespace s4u {
/** @ingroup s4u_api
namespace s4u {
/** @ingroup s4u_api
@@
-31,8
+31,9
@@
namespace s4u {
* The total computing power that the contained actors can get is constrained to the virtual machine size.
*
*/
* The total computing power that the contained actors can get is constrained to the virtual machine size.
*
*/
-XBT_PUBLIC_CLASS VirtualMachine : public s4u::Host
-{
+class XBT_PUBLIC VirtualMachine : public s4u::Host {
+ simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
+ virtual ~VirtualMachine();
public:
explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount);
public:
explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount);
@@
-42,27
+43,23
@@
public:
VirtualMachine(VirtualMachine const&) = delete;
VirtualMachine& operator=(VirtualMachine const&) = delete;
VirtualMachine(VirtualMachine const&) = delete;
VirtualMachine& operator=(VirtualMachine const&) = delete;
-private:
- virtual ~VirtualMachine();
-public:
+ simgrid::vm::VirtualMachineImpl* getImpl() { return pimpl_vm_; }
void start();
void suspend();
void resume();
void start();
void suspend();
void resume();
+ void shutdown();
+ void destroy();
- bool isMigrating();
-
- void getParameters(vm_params_t params);
- void setParameters(vm_params_t params);
simgrid::s4u::Host* getPm();
simgrid::s4u::Host* getPm();
+ void setPm(simgrid::s4u::Host * pm);
size_t getRamsize();
void setRamsize(size_t ramsize);
size_t getRamsize();
void setRamsize(size_t ramsize);
+ void setBound(double bound);
e_surf_vm_state_t getState();
e_surf_vm_state_t getState();
-
- /* FIXME: protect me */
- simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
+ static simgrid::xbt::signal<void(simgrid::s4u::VirtualMachine*)> onVmShutdown;
};
}
} // namespace simgrid::s4u
};
}
} // namespace simgrid::s4u
-#endif
/* SIMGRID_S4U_HOST_HPP */
+#endif