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
no need for a lib to store the netcards. A dict is easier
[simgrid.git]
/
src
/
msg
/
msg_environment.cpp
diff --git
a/src/msg/msg_environment.cpp
b/src/msg/msg_environment.cpp
index
5e29b97
..
9783390
100644
(file)
--- a/
src/msg/msg_environment.cpp
+++ b/
src/msg/msg_environment.cpp
@@
-8,7
+8,7
@@
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "simgrid/s4u/
As
.hpp"
+#include "simgrid/s4u/
NetZone
.hpp"
#include "simgrid/s4u/engine.hpp"
#if HAVE_LUA
#include "simgrid/s4u/engine.hpp"
#if HAVE_LUA
@@
-50,31
+50,37
@@
void MSG_post_create_environment() {
}
}
}
}
-msg_as_t MSG_environment_get_routing_root() {
- return simgrid::s4u::Engine::instance()->rootAs();
+msg_netzone_t MSG_environment_get_routing_root()
+{
+ return simgrid::s4u::Engine::instance()->netRoot();
+}
+
+const char* MSG_environment_as_get_name(msg_netzone_t netzone)
+{
+ return netzone->name();
}
}
-const char *MSG_environment_as_get_name(msg_as_t as) {
- return as->name();
+msg_netzone_t MSG_environment_as_get_by_name(const char* name)
+{
+ return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
}
}
-msg_as_t MSG_environment_as_get_by_name(const char * name) {
- return simgrid::s4u::Engine::instance()->asByNameOrNull(name);
+xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t netzone)
+{
+ return netzone->children();
}
}
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
- return as->children();
+const char* MSG_environment_as_get_property_value(msg_netzone_t netzone, const char* name)
+{
+ return netzone->property(name);
}
}
-
const char *MSG_environment_as_get_property_value(msg_as_t as, const char *nam
e)
+
void MSG_environment_as_set_property_value(msg_netzone_t netzone, const char* name, char* valu
e)
{
{
- xbt_dict_t dict = static_cast<xbt_dict_t> (xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as),
- ROUTING_PROP_ASR_LEVEL));
- if (dict==nullptr)
- return nullptr;
- return static_cast<const char*>(xbt_dict_get_or_null(dict, name));
+ netzone->setProperty(name, value);
}
}
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
- return as->hosts();
+xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone)
+{
+ return netzone->hosts();
}
}