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
Remove redundant access specifier.
[simgrid.git]
/
src
/
plugins
/
vm
/
VirtualMachineImpl.hpp
diff --git
a/src/plugins/vm/VirtualMachineImpl.hpp
b/src/plugins/vm/VirtualMachineImpl.hpp
index
39487a8
..
026071e
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,6
+16,8
@@
#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 {
@@
-84,14
+89,10
@@
public:
surf::Action* action_ = nullptr;
/* Dirty pages stuff */
surf::Action* action_ = nullptr;
/* Dirty pages stuff */
+ std::unordered_map<std::string, dirty_page_t> dp_objs;
int dp_enabled = 0;
int dp_enabled = 0;
- xbt_dict_t dp_objs = nullptr;
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_;
@@
-100,10
+101,9
@@
public:
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:
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
};
e_surf_vm_state_t vmState_ = SURF_VM_STATE_CREATED;
};
@@
-116,6
+116,7
@@
protected:
*/
class VMModel : public surf::HostModel {
public:
*/
class VMModel : public surf::HostModel {
public:
+ VMModel();
void ignoreEmptyVmInPmLMM() override{};
double nextOccuringEvent(double now) override;
void ignoreEmptyVmInPmLMM() override{};
double nextOccuringEvent(double now) override;