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
d070253
..
9783390
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/NetZone.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>
@@
-35,7
+38,7
@@
void MSG_create_environment(const char *file)
SIMIX_create_environment(file);
}
SIMIX_create_environment(file);
}
-void MSG_post_create_environment(
void
) {
+void MSG_post_create_environment() {
xbt_lib_cursor_t cursor;
void **data;
char *name;
xbt_lib_cursor_t cursor;
void **data;
char *name;
@@
-47,31
+50,37
@@
void MSG_post_create_environment(void) {
}
}
}
}
-msg_as_t MSG_environment_get_routing_root() {
- return surf_AS_get_routing_root();
+msg_netzone_t MSG_environment_get_routing_root()
+{
+ return simgrid::s4u::Engine::instance()->netRoot();
}
}
-const char *MSG_environment_as_get_name(msg_as_t as) {
- return surf_AS_get_name(as);
+const char* MSG_environment_as_get_name(msg_netzone_t netzone)
+{
+ return netzone->name();
}
}
-msg_as_t MSG_environment_as_get_by_name(const char * name) {
- return surf_AS_get_by_name(name);
+msg_netzone_t MSG_environment_as_get_by_name(const char* name)
+{
+ return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
}
}
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_
as_t as) {
- xbt_dict_t res = surf_AS_get_routing_sons(as);
- return
res
;
+xbt_dict_t MSG_environment_as_get_routing_sons(msg_
netzone_t netzone)
+{
+ return
netzone->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_netzone_t netzone, const char*
name)
{
{
- xbt_dict_t dict = (xbt_dict_t) xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as), ROUTING_PROP_ASR_LEVEL);
- if (dict==NULL)
- return NULL;
- return (char*) xbt_dict_get_or_null(dict, name);
+ return netzone->property(name);
}
}
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
- return surf_AS_get_hosts(as);
+void MSG_environment_as_set_property_value(msg_netzone_t netzone, const char* name, char* value)
+{
+ netzone->setProperty(name, value);
+}
+
+xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone)
+{
+ return netzone->hosts();
}
}