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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_environment.cpp
diff --git
a/src/msg/msg_environment.cpp
b/src/msg/msg_environment.cpp
index
067eb5f
..
122783e
100644
(file)
--- a/
src/msg/msg_environment.cpp
+++ b/
src/msg/msg_environment.cpp
@@
-1,19
+1,20
@@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2016. 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. */
-#include "
msg_private.h
"
-#include "
xbt/sysdep.h
"
-#include "
xbt/log
.h"
+#include "
simgrid/s4u/NetZone.hpp
"
+#include "
simgrid/s4u/engine.hpp
"
+#include "
src/msg/msg_private
.h"
-#if
def
HAVE_LUA
+#if HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
#endif
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
#endif
+SG_BEGIN_DECL()
+
/********************************* MSG **************************************/
/** \ingroup msg_simulation
/********************************* MSG **************************************/
/** \ingroup msg_simulation
@@
-35,7
+36,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
+48,39
@@
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_netzone_t netzone)
+{
+ return netzone->name();
}
}
-const char *MSG_environment_as_get_name(msg_as_t as) {
- return surf_AS_get_name(as);
+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 surf_AS_get_by_name(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) {
- xbt_dict_t res = surf_AS_get_children(as);
- return
res
;
+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 = (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);
+ netzone->setProperty(name, value);
}
}
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
- return surf_AS_get_hosts(as);
+xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone)
+{
+ return netzone->hosts();
}
}
+
+SG_END_DECL()