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
s4u::Host->getLoad() returns the achieved speed in flops/s
[simgrid.git]
/
include
/
simgrid
/
s4u
/
VirtualMachine.hpp
diff --git
a/include/simgrid/s4u/VirtualMachine.hpp
b/include/simgrid/s4u/VirtualMachine.hpp
index
de3ecc0
..
c999f96
100644
(file)
--- a/
include/simgrid/s4u/VirtualMachine.hpp
+++ b/
include/simgrid/s4u/VirtualMachine.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-201
7
. 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,19
+6,16
@@
#ifndef SIMGRID_S4U_VM_HPP
#define SIMGRID_S4U_VM_HPP
#ifndef SIMGRID_S4U_VM_HPP
#define SIMGRID_S4U_VM_HPP
-#include
<simgrid/s4u/forward.hpp>
-#include
<simgrid/s4u/host.hpp>
-#include
<xbt/base.h>
+#include
"simgrid/datatypes.h"
+#include
"simgrid/s4u/Host.hpp"
+#include
"simgrid/s4u/forward.hpp"
-
typedef enum
{
+
enum e_surf_vm_state_t
{
SURF_VM_STATE_CREATED, /**< created, but not yet started */
SURF_VM_STATE_RUNNING,
SURF_VM_STATE_SUSPENDED, /**< Suspend/resume does not involve disk I/O, so we assume there is no transition states. */
SURF_VM_STATE_CREATED, /**< created, but not yet started */
SURF_VM_STATE_RUNNING,
SURF_VM_STATE_SUSPENDED, /**< Suspend/resume does not involve disk I/O, so we assume there is no transition states. */
-
- SURF_VM_STATE_SAVING, /**< Save/restore involves disk I/O, so there should be transition states. */
- SURF_VM_STATE_SAVED,
- SURF_VM_STATE_RESTORING,
-} e_surf_vm_state_t;
+ SURF_VM_STATE_DESTROYED
+};
namespace simgrid {
namespace vm {
namespace simgrid {
namespace vm {
@@
-38,7
+35,8
@@
XBT_PUBLIC_CLASS VirtualMachine : public s4u::Host
{
public:
{
public:
- explicit VirtualMachine(const char* name, s4u::Host* hostPm);
+ explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount);
+ explicit VirtualMachine(const char* name, s4u::Host* hostPm, int coreAmount, size_t ramsize);
// No copy/move
VirtualMachine(VirtualMachine const&) = delete;
// No copy/move
VirtualMachine(VirtualMachine const&) = delete;
@@
-46,13
+44,20
@@
public:
private:
virtual ~VirtualMachine();
private:
virtual ~VirtualMachine();
-
public:
public:
+ void start();
+ void suspend();
+ void resume();
+
bool isMigrating();
bool isMigrating();
- void
p
arameters(vm_params_t params);
+ void
getP
arameters(vm_params_t params);
void setParameters(vm_params_t params);
void setParameters(vm_params_t params);
- double getRamsize();
+ simgrid::s4u::Host* getPm();
+ size_t getRamsize();
+ void setRamsize(size_t ramsize);
+
+ e_surf_vm_state_t getState();
/* FIXME: protect me */
simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;
/* FIXME: protect me */
simgrid::vm::VirtualMachineImpl* pimpl_vm_ = nullptr;