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
please sonar
[simgrid.git]
/
src
/
msg
/
msg_environment.cpp
diff --git
a/src/msg/msg_environment.cpp
b/src/msg/msg_environment.cpp
index
bf29367
..
15f3b15
100644
(file)
--- a/
src/msg/msg_environment.cpp
+++ b/
src/msg/msg_environment.cpp
@@
-1,15
+1,11
@@
-/* 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 "simgrid/s4u/NetZone.hpp"
#include "simgrid/s4u/engine.hpp"
+#include "src/msg/msg_private.h"
#if HAVE_LUA
#include <lua.h>
#if HAVE_LUA
#include <lua.h>
@@
-55,9
+51,9
@@
msg_netzone_t MSG_environment_get_routing_root()
return simgrid::s4u::Engine::instance()->netRoot();
}
return simgrid::s4u::Engine::instance()->netRoot();
}
-const char* MSG_environment_as_get_name(msg_netzone_t
as
)
+const char* MSG_environment_as_get_name(msg_netzone_t
netzone
)
{
{
- return
as
->name();
+ return
netzone
->name();
}
msg_netzone_t MSG_environment_as_get_by_name(const char* name)
}
msg_netzone_t MSG_environment_as_get_by_name(const char* name)
@@
-65,21
+61,22
@@
msg_netzone_t MSG_environment_as_get_by_name(const char* name)
return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
}
return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
}
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t as)
+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_netzone_t netzone, const char* name)
{
{
- return
as->children(
);
+ return
netzone->property(name
);
}
}
-
const char* MSG_environment_as_get_property_value(msg_netzone_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_netzone_t
as
)
+xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t
netzone
)
{
{
- return
as
->hosts();
+ return
netzone
->hosts();
}
}