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
Constify getName()/getCname() in s4u::NetZone.
[simgrid.git]
/
include
/
simgrid
/
s4u
/
NetZone.hpp
diff --git
a/include/simgrid/s4u/NetZone.hpp
b/include/simgrid/s4u/NetZone.hpp
index
c05a251
..
fc8c8fa
100644
(file)
--- a/
include/simgrid/s4u/NetZone.hpp
+++ b/
include/simgrid/s4u/NetZone.hpp
@@
-1,4
+1,4
@@
-/* 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. */
@@
-38,24
+38,26
@@
XBT_PUBLIC_CLASS NetZone
protected:
friend simgrid::kernel::routing::NetZoneImpl;
protected:
friend simgrid::kernel::routing::NetZoneImpl;
- explicit NetZone(NetZone * father,
const char*
name);
+ explicit NetZone(NetZone * father,
std::string
name);
virtual ~NetZone();
virtual ~NetZone();
- std::vector<Host*> hosts_;
public:
/** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
virtual void seal();
public:
/** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
virtual void seal();
- char* name();
- NetZone* father();
+ /** @brief Retrieves the name of that netzone as a C++ string */
+ const std::string& getName() const { return name_; }
+ /** @brief Retrieves the name of that netzone as a C string */
+ const char* getCname() const;
+ NetZone* getFather();
-
xbt_dict_t children();
// Sub netzones
-
std::vector<Host*>* hosts(); //
my content as a vector of hosts
+
std::vector<NetZone*>* getChildren();
// Sub netzones
+
void getHosts(std::vector<s4u::Host*> * whereto); // retrieve
my content as a vector of hosts
/** Get the properties assigned to a host */
/** Get the properties assigned to a host */
- std::unordered_map<std::string, std::string>*
p
roperties();
+ std::unordered_map<std::string, std::string>*
getP
roperties();
/** Retrieve the property value (or nullptr if not set) */
/** Retrieve the property value (or nullptr if not set) */
- const char*
p
roperty(const char* key);
+ const char*
getP
roperty(const char* key);
void setProperty(const char* key, const char* value);
/* Add content to the netzone, at parsing time. It should be sealed afterward. */
void setProperty(const char* key, const char* value);
/* Add content to the netzone, at parsing time. It should be sealed afterward. */
@@
-68,19
+70,24
@@
public:
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
std::vector<surf::LinkImpl*>* link_list)>
onRouteCreation;
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
std::vector<surf::LinkImpl*>* link_list)>
onRouteCreation;
+ static simgrid::xbt::signal<void(NetZone&)> onCreation;
+ static simgrid::xbt::signal<void(NetZone&)> onSeal;
protected:
protected:
- std::vector<kernel::routing::NetPoint*>
- vertices_; // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
+ unsigned int getTableSize() { return vertices_.size(); }
+ std::vector<kernel::routing::NetPoint*> getVertices() { return vertices_; }
private:
private:
+ // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
+ std::vector<kernel::routing::NetPoint*> vertices_;
+
std::unordered_map<std::string, std::string> properties_;
NetZone* father_ = nullptr;
std::unordered_map<std::string, std::string> properties_;
NetZone* father_ = nullptr;
-
char* name_ = nullptr
;
+
std::string name_
;
bool sealed_ = false; // We cannot add more content when sealed
bool sealed_ = false; // We cannot add more content when sealed
-
xbt_dict_t children_ = xbt_dict_new_homogeneous(nullptr)
; // sub-netzones
+
std::vector<NetZone*>* children_ = nullptr
; // sub-netzones
};
}
}; // Namespace simgrid::s4u
};
}
}; // Namespace simgrid::s4u