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
plug a memleak
[simgrid.git]
/
src
/
msg
/
msg_environment.cpp
diff --git
a/src/msg/msg_environment.cpp
b/src/msg/msg_environment.cpp
index
067eb5f
..
2b19c76
100644
(file)
--- a/
src/msg/msg_environment.cpp
+++ b/
src/msg/msg_environment.cpp
@@
-8,7
+8,10
@@
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#ifdef HAVE_LUA
+#include "simgrid/s4u/As.hpp"
+#include "simgrid/s4u/engine.hpp"
+
+#if HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
@@
-48,20
+51,19
@@
void MSG_post_create_environment(void) {
}
msg_as_t MSG_environment_get_routing_root() {
}
msg_as_t MSG_environment_get_routing_root() {
- return s
urf_AS_get_routing_root
();
+ return s
imgrid::s4u::Engine::instance()->rootAs
();
}
const char *MSG_environment_as_get_name(msg_as_t as) {
}
const char *MSG_environment_as_get_name(msg_as_t as) {
- return
surf_AS_get_name(as
);
+ return
as->name(
);
}
msg_as_t MSG_environment_as_get_by_name(const char * name) {
}
msg_as_t MSG_environment_as_get_by_name(const char * name) {
- return s
urf_AS_get_by_name
(name);
+ return s
imgrid::s4u::Engine::instance()->asByNameOrNull
(name);
}
xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
}
xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
- xbt_dict_t res = surf_AS_get_children(as);
- return res;
+ return as->children();
}
const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
}
const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
@@
-73,5
+75,5
@@
const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
}
xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
}
xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
- return
surf_AS_get_hosts(as
);
+ return
as->hosts(
);
}
}