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
Merge pull request #256 from Flamefire/master
[simgrid.git]
/
src
/
kernel
/
EngineImpl.hpp
diff --git
a/src/kernel/EngineImpl.hpp
b/src/kernel/EngineImpl.hpp
index
d8f96c2
..
cba6843
100644
(file)
--- a/
src/kernel/EngineImpl.hpp
+++ b/
src/kernel/EngineImpl.hpp
@@
-1,18
+1,16
@@
-/* Copyright (c) 2016
. The SimGrid Team. All rights reserved.
*/
+/* Copyright (c) 2016
-2017. 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. */
+#include <map>
+#include <simgrid/s4u/NetZone.hpp>
#include <simgrid/s4u/forward.hpp>
#include <string>
#include <unordered_map>
namespace simgrid {
namespace kernel {
#include <simgrid/s4u/forward.hpp>
#include <string>
#include <unordered_map>
namespace simgrid {
namespace kernel {
-namespace routing {
-class NetZoneImpl;
-class NetPoint;
-}
class EngineImpl {
public:
class EngineImpl {
public:
@@
-20,7
+18,9
@@
public:
virtual ~EngineImpl();
kernel::routing::NetZoneImpl* netRoot_ = nullptr;
virtual ~EngineImpl();
kernel::routing::NetZoneImpl* netRoot_ = nullptr;
-protected:
+private:
+ std::map<std::string, simgrid::s4u::Host*> hosts_;
+ std::map<std::string, simgrid::s4u::Storage*> storages_;
std::unordered_map<std::string, simgrid::kernel::routing::NetPoint*> netpoints_;
friend simgrid::s4u::Engine;
};
std::unordered_map<std::string, simgrid::kernel::routing::NetPoint*> netpoints_;
friend simgrid::s4u::Engine;
};