fix bugs due to subVariable method

[simgrid.git] / src / msg / msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 9783390..3c3bdf8 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. */
 
-#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 HAVE_LUA
 #include <lua.h>
@@ -17,6 +13,8 @@
 #include <lualib.h>
 #endif
 
+SG_BEGIN_DECL()
+
 /********************************* MSG **************************************/
 
 /** \ingroup msg_simulation
@@ -67,7 +65,11 @@ msg_netzone_t MSG_environment_as_get_by_name(const char* name)
 
 xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t netzone)
 {
-  return netzone->children();
+  xbt_dict_t res = xbt_dict_new_homogeneous(nullptr);
+  for (auto elem : *netzone->children()) {
+    xbt_dict_set(res, elem->name(), static_cast<void*>(elem), nullptr);
+  }
+  return res;
 }
 
 const char* MSG_environment_as_get_property_value(msg_netzone_t netzone, const char* name)
@@ -82,5 +84,13 @@ void MSG_environment_as_set_property_value(msg_netzone_t netzone, const char* na
 
 xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone)
 {
-  return netzone->hosts();
+  xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
+
+  for (auto host : *netzone->hosts()) {
+    xbt_dynar_push(res, &host);
+  }
+
+  return res;
 }
+
+SG_END_DECL()