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
Cosmetics: make #endif's comment match #ifndef.
[simgrid.git]
/
src
/
surf
/
HostImpl.hpp
diff --git
a/src/surf/HostImpl.hpp
b/src/surf/HostImpl.hpp
index
fa0c5db
..
bb01090
100644
(file)
--- a/
src/surf/HostImpl.hpp
+++ b/
src/surf/HostImpl.hpp
@@
-1,17
+1,17
@@
-/* Copyright (c) 2004-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
20
. 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. */
-#ifndef SURF_HOST_INTERFACE_HPP
_
-#define SURF_HOST_INTERFACE_HPP
_
+#ifndef SURF_HOST_INTERFACE_HPP
+#define SURF_HOST_INTERFACE_HPP
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
-#include "src/surf/PropertyHolder.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include <xbt/PropertyHolder.hpp>
#include <vector>
#include <vector>
@@
-32,7
+32,7
@@
public:
virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount,
virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount,
- double rate);
+ double rate)
= 0
;
};
/************
};
/************
@@
-42,8
+42,11
@@
public:
* @brief SURF Host interface class
* @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
*/
* @brief SURF Host interface class
* @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
*/
-class XBT_PRIVATE HostImpl : public
simgrid::surf
::PropertyHolder {
+class XBT_PRIVATE HostImpl : public
xbt
::PropertyHolder {
std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
+ s4u::Host* piface_ = nullptr; // FIXME: why don't we store a s4u::Host here as we do everywhere else?
+ std::map<std::string, kernel::resource::StorageImpl*> storage_;
+ std::vector<kernel::resource::DiskImpl*> disks_;
public:
friend simgrid::vm::VirtualMachineImpl;
public:
friend simgrid::vm::VirtualMachineImpl;
@@
-51,19
+54,19
@@
public:
virtual ~HostImpl();
std::vector<s4u::Disk*> get_disks();
virtual ~HostImpl();
std::vector<s4u::Disk*> get_disks();
- void add_disk(s4u::Disk* disk);
+ void set_disks(const std::vector<kernel::resource::DiskImpl*>& disks, s4u::Host* host);
+ void add_disk(const s4u::Disk* disk);
void remove_disk(const std::string& disk_name);
/** @brief Get the vector of storages (by names) attached to the Host */
virtual std::vector<const char*> get_attached_storages();
void remove_disk(const std::string& disk_name);
/** @brief Get the vector of storages (by names) attached to the Host */
virtual std::vector<const char*> get_attached_storages();
+ std::unordered_map<std::string, s4u::Storage*>* get_mounted_storages();
+ void set_storages(const std::map<std::string, kernel::resource::StorageImpl*>& storages) { storage_ = storages; }
- std::map<std::string, kernel::resource::StorageImpl*> storage_;
- std::vector<kernel::resource::DiskImpl*> disks_;
-
- s4u::Host* piface_ = nullptr;
+ s4u::Host* get_iface() { return piface_; }
void turn_on();
void turn_on();
- void turn_off();
+ void turn_off(
kernel::actor::ActorImpl* issuer
);
std::vector<s4u::ActorPtr> get_all_actors();
size_t get_actor_count();
void add_actor(kernel::actor::ActorImpl* actor) { actor_list_.push_back(*actor); }
std::vector<s4u::ActorPtr> get_all_actors();
size_t get_actor_count();
void add_actor(kernel::actor::ActorImpl* actor) { actor_list_.push_back(*actor); }
@@
-84,4
+87,4
@@
public:
XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
-#endif /* SURF_H
ost_INTERFACE_HPP_
*/
+#endif /* SURF_H
OST_INTERFACE_HPP
*/