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
please clang
[simgrid.git]
/
include
/
simgrid
/
s4u
/
NetZone.hpp
diff --git
a/include/simgrid/s4u/NetZone.hpp
b/include/simgrid/s4u/NetZone.hpp
index
8156699
..
815b176
100644
(file)
--- a/
include/simgrid/s4u/NetZone.hpp
+++ b/
include/simgrid/s4u/NetZone.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2016-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-201
9
. 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. */
@@
-25,7
+25,7
@@
namespace s4u {
*/
class XBT_PUBLIC NetZone {
protected:
*/
class XBT_PUBLIC NetZone {
protected:
- friend
simgrid::
kernel::routing::NetZoneImpl;
+ friend kernel::routing::NetZoneImpl;
explicit NetZone(kernel::routing::NetZoneImpl* impl);
~NetZone();
explicit NetZone(kernel::routing::NetZoneImpl* impl);
~NetZone();
@@
-44,7
+44,7
@@
public:
kernel::routing::NetZoneImpl* get_impl() { return pimpl_; }
private:
kernel::routing::NetZoneImpl* get_impl() { return pimpl_; }
private:
- kernel::routing::NetZoneImpl* pimpl_;
+ kernel::routing::NetZoneImpl*
const
pimpl_;
std::unordered_map<std::string, std::string> properties_;
public:
std::unordered_map<std::string, std::string> properties_;
public:
@@
-54,8
+54,8
@@
public:
std::vector<NetZone*> get_children();
/** Retrieve the property value (or nullptr if not set) */
std::vector<NetZone*> get_children();
/** Retrieve the property value (or nullptr if not set) */
- const char* get_property(
std::string
key);
- void set_property(
std::string key, std::string
value);
+ const char* get_property(
const std::string&
key);
+ void set_property(
const std::string& key, const std::string&
value);
/* Add content to the netzone, at parsing time. It should be sealed afterward. */
int add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */
/* Add content to the netzone, at parsing time. It should be sealed afterward. */
int add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */
@@
-67,13
+67,14
@@
public:
std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical);
/*** Called on each newly created regular route (not on bypass routes) */
std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical);
/*** Called on each newly created regular route (not on bypass routes) */
- static
simgrid::
xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
-
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-
std::vector<kernel::resource::LinkImpl*>
& link_list)>
+ static xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+ kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+
std::vector<kernel::resource::LinkImpl*> const
& link_list)>
on_route_creation;
on_route_creation;
- static
simgrid::xbt::signal<void(NetZone
&)> on_creation;
- static
simgrid::xbt::signal<void(NetZone
&)> on_seal;
+ static
xbt::signal<void(NetZone const
&)> on_creation;
+ static
xbt::signal<void(NetZone const
&)> on_seal;
+#ifndef DOXYGEN
// Deprecation wrappers
/** @deprecated NetZone::get_father() */
XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_father()") NetZone* getFather() { return get_father(); }
// Deprecation wrappers
/** @deprecated NetZone::get_father() */
XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_father()") NetZone* getFather() { return get_father(); }
@@
-84,14
+85,14
@@
public:
/** @deprecated NetZone::add_route() */
XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_route()") void addRoute(
kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
/** @deprecated NetZone::add_route() */
XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_route()") void addRoute(
kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
- kernel::routing::NetPoint* gw_dst, std::vector<
simgrid::
kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+ kernel::routing::NetPoint* gw_dst, std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
{
add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
/** @deprecated NetZone::add_bypass_route() */
XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_bypass_route()") void addBypassRoute(
kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
{
add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
/** @deprecated NetZone::add_bypass_route() */
XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_bypass_route()") void addBypassRoute(
kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
- kernel::routing::NetPoint* gw_dst, std::vector<
simgrid::
kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+ kernel::routing::NetPoint* gw_dst, std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
{
add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
{
add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
@@
-130,8
+131,10
@@
public:
res->push_back(child);
return res;
}
res->push_back(child);
return res;
}
+#endif
};
};
-}
-}; // Namespace simgrid::s4u
+
+} // namespace s4u
+} // namespace simgrid
#endif /* SIMGRID_S4U_NETZONE_HPP */
#endif /* SIMGRID_S4U_NETZONE_HPP */