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
let's use a sensible API for the MSG_zone functions
[simgrid.git]
/
src
/
msg
/
msg_environment.cpp
diff --git
a/src/msg/msg_environment.cpp
b/src/msg/msg_environment.cpp
index
3c3bdf8
..
fb2c8ad
100644
(file)
--- a/
src/msg/msg_environment.cpp
+++ b/
src/msg/msg_environment.cpp
@@
-1,13
+1,13
@@
-/* Copyright (c) 2004-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
7
. 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 "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/s4u/engine.hpp"
#include "src/msg/msg_private.h"
#include "src/msg/msg_private.h"
-#if HAVE_LUA
+#if
SIMGRID_
HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
@@
-48,49
+48,43
@@
void MSG_post_create_environment() {
}
}
}
}
-msg_netzone_t MSG_
environment_get_routing
_root()
+msg_netzone_t MSG_
zone_get
_root()
{
return simgrid::s4u::Engine::instance()->netRoot();
}
{
return simgrid::s4u::Engine::instance()->netRoot();
}
-const char* MSG_
environment_as
_get_name(msg_netzone_t netzone)
+const char* MSG_
zone
_get_name(msg_netzone_t netzone)
{
return netzone->name();
}
{
return netzone->name();
}
-msg_netzone_t MSG_
environment_as
_get_by_name(const char* name)
+msg_netzone_t MSG_
zone
_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 netzone
)
+
void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto
)
{
{
- xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
for (auto elem : *netzone->children()) {
for (auto elem : *netzone->children()) {
- xbt_dict_set(
res
, elem->name(), static_cast<void*>(elem), nullptr);
+ xbt_dict_set(
whereto
, elem->name(), static_cast<void*>(elem), nullptr);
}
}
- return res;
}
}
-const char* MSG_
environment_as
_get_property_value(msg_netzone_t netzone, const char* name)
+const char* MSG_
zone
_get_property_value(msg_netzone_t netzone, const char* name)
{
return netzone->property(name);
}
{
return netzone->property(name);
}
-void MSG_
environment_as
_set_property_value(msg_netzone_t netzone, const char* name, char* value)
+void MSG_
zone
_set_property_value(msg_netzone_t netzone, const char* name, char* value)
{
netzone->setProperty(name, value);
}
{
netzone->setProperty(name, value);
}
-
xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone
)
+
void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto
)
{
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
-
for (auto host : *netzone->hosts()) {
for (auto host : *netzone->hosts()) {
- xbt_dynar_push(
res
, &host);
+ xbt_dynar_push(
whereto
, &host);
}
}
-
- return res;
}
SG_END_DECL()
}
SG_END_DECL()