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
mv VM shutdown to the plugin
[simgrid.git]
/
src
/
plugins
/
vm
/
VirtualMachineImpl.hpp
diff --git
a/src/plugins/vm/VirtualMachineImpl.hpp
b/src/plugins/vm/VirtualMachineImpl.hpp
index
d937176
..
0dda5ea
100644
(file)
--- a/
src/plugins/vm/VirtualMachineImpl.hpp
+++ b/
src/plugins/vm/VirtualMachineImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-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,6
+6,9
@@
#include "simgrid/s4u/VirtualMachine.hpp"
#include "src/simix/ActorImpl.hpp"
#include "src/surf/HostImpl.hpp"
#include "simgrid/s4u/VirtualMachine.hpp"
#include "src/simix/ActorImpl.hpp"
#include "src/surf/HostImpl.hpp"
+#include <algorithm>
+#include <deque>
+#include <unordered_map>
#ifndef VM_INTERFACE_HPP_
#define VM_INTERFACE_HPP_
#ifndef VM_INTERFACE_HPP_
#define VM_INTERFACE_HPP_
@@
-13,16
+16,11
@@
#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 {
-/***********
- * Classes *
- ***********/
-
-class XBT_PRIVATE VMModel;
-XBT_PUBLIC_CLASS VirtualMachineImpl; // Made visible to the Java plugin
-
/*************
* Callbacks *
*************/
/*************
* Callbacks *
*************/
@@
-55,7
+53,7
@@
XBT_PUBLIC_CLASS VirtualMachineImpl : public surf::HostImpl
friend simgrid::s4u::VirtualMachine;
public:
friend simgrid::s4u::VirtualMachine;
public:
- explicit VirtualMachineImpl(s4u::VirtualMachine * piface, s4u::Host * host, int coreAmount);
+ explicit VirtualMachineImpl(s4u::VirtualMachine * piface, s4u::Host * host, int coreAmount
, size_t ramsize
);
~VirtualMachineImpl();
/** @brief Suspend the VM */
~VirtualMachineImpl();
/** @brief Suspend the VM */
@@
-73,7
+71,8
@@
public:
/** @brief Get the physical machine hosting the VM */
s4u::Host* getPm();
/** @brief Get the physical machine hosting the VM */
s4u::Host* getPm();
- sg_size_t getRamsize();
+ sg_size_t getRamsize() { return ramsize_; }
+ void setRamsize(sg_size_t ramsize) { ramsize_ = ramsize; }
virtual void setBound(double bound);
virtual void setBound(double bound);
@@
-84,25
+83,22
@@
public:
surf::Action* action_ = nullptr;
/* Dirty pages stuff */
surf::Action* action_ = nullptr;
/* Dirty pages stuff */
-
int dp_enabled = 0
;
-
xbt_dict_t dp_objs = nullptr
;
+
std::unordered_map<std::string, dirty_page_t> dp_objs
;
+
bool dp_enabled = false
;
double dp_updated_by_deleted_tasks = 0;
double dp_updated_by_deleted_tasks = 0;
-protected:
- simgrid::s4u::Host* hostPM_;
-
-public:
e_surf_vm_state_t getState();
void setState(e_surf_vm_state_t state);
static std::deque<s4u::VirtualMachine*> allVms_;
e_surf_vm_state_t getState();
void setState(e_surf_vm_state_t state);
static std::deque<s4u::VirtualMachine*> allVms_;
+ int coreAmount() { return coreAmount_; }
bool isMigrating = false;
private:
bool isMigrating = false;
private:
+ simgrid::s4u::Host* hostPM_;
s_vm_params_t params_;
int coreAmount_;
s_vm_params_t params_;
int coreAmount_;
-
-protected:
+ size_t ramsize_ = 0;
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
};
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
};
@@
-113,8
+109,9
@@
protected:
* @brief SURF VM model interface class
* @details A model is an object which handle the interactions between its Resources and its Actions
*/
* @brief SURF VM model interface class
* @details A model is an object which handle the interactions between its Resources and its Actions
*/
-class VMModel : public surf::HostModel {
+class
XBT_PRIVATE
VMModel : public surf::HostModel {
public:
public:
+ VMModel();
void ignoreEmptyVmInPmLMM() override{};
double nextOccuringEvent(double now) override;
void ignoreEmptyVmInPmLMM() override{};
double nextOccuringEvent(double now) override;