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
simplify the way Jbods are defined
[simgrid.git]
/
src
/
kernel
/
resource
/
VirtualMachineImpl.hpp
diff --git
a/src/kernel/resource/VirtualMachineImpl.hpp
b/src/kernel/resource/VirtualMachineImpl.hpp
index c5a4bc0da7473878dc5c0fae01b01a80c9cb5f6e..781a33be187d6724b31ee185135aa8aadd57a518 100644
(file)
--- a/
src/kernel/resource/VirtualMachineImpl.hpp
+++ b/
src/kernel/resource/VirtualMachineImpl.hpp
@@
-1,11
+1,11
@@
-/* Copyright (c) 2004-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-202
3
. 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. */
#include <simgrid/s4u/VirtualMachine.hpp>
/* 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. */
#include <simgrid/s4u/VirtualMachine.hpp>
-#include "src/
surf
/HostImpl.hpp"
+#include "src/
kernel/resource
/HostImpl.hpp"
#ifndef VM_INTERFACE_HPP_
#define VM_INTERFACE_HPP_
#ifndef VM_INTERFACE_HPP_
#define VM_INTERFACE_HPP_
@@
-14,8
+14,7
@@
namespace simgrid {
extern template class XBT_PUBLIC xbt::Extendable<kernel::resource::VirtualMachineImpl>;
extern template class XBT_PUBLIC xbt::Extendable<kernel::resource::VirtualMachineImpl>;
-namespace kernel {
-namespace resource {
+namespace kernel::resource {
/************
* Resource *
/************
* Resource *
@@
-31,6
+30,8
@@
public:
explicit VirtualMachineImpl(const std::string& name, s4u::VirtualMachine* piface, s4u::Host* host, int core_amount,
size_t ramsize);
explicit VirtualMachineImpl(const std::string& name, s4u::VirtualMachine* piface, s4u::Host* host, int core_amount,
size_t ramsize);
+ explicit VirtualMachineImpl(const std::string& name, simgrid::s4u::Host* host_PM, int core_amount, size_t ramsize);
+ void set_piface(s4u::VirtualMachine* piface);
void start();
void suspend(const actor::ActorImpl* issuer);
void start();
void suspend(const actor::ActorImpl* issuer);
@@
-68,7
+69,7
@@
public:
void seal() override;
private:
void seal() override;
private:
- s4u::VirtualMachine* piface_;
+ s4u::VirtualMachine* piface_
= nullptr
;
Action* action_ = nullptr;
unsigned int active_execs_ = 0;
s4u::Host* physical_host_;
Action* action_ = nullptr;
unsigned int active_execs_ = 0;
s4u::Host* physical_host_;
@@
-82,8
+83,8
@@
private:
/*********
* Model *
*********/
/*********
* Model *
*********/
-/** @ingroup
SURF
_vm_interface
- * @brief
SURF
VM model interface class
+/** @ingroup
Model
_vm_interface
+ * @brief VM model interface class
* @details A model is an object which handle the interactions between its Resources and its Actions
*/
class XBT_PRIVATE VMModel : public HostModel {
* @details A model is an object which handle the interactions between its Resources and its Actions
*/
class XBT_PRIVATE VMModel : public HostModel {
@@
-99,8
+100,7
@@
public:
return nullptr;
};
};
return nullptr;
};
};
-} // namespace resource
-} // namespace kernel
+} // namespace kernel::resource
} // namespace simgrid
#endif /* VM_INTERFACE_HPP_ */
} // namespace simgrid
#endif /* VM_INTERFACE_HPP_ */