X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d67d38c5d53db9323f33313ed9484d2ee598fb9..358b3ac1d1ce9e2cfcc7583271916ebd96eff6da:/src/msg/msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index feeb629ea5..fc067f7130 100644
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -1,22 +1,20 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2017. 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/Engine.hpp"
+#include "simgrid/s4u/NetZone.hpp"
+#include "src/msg/msg_private.h"
 
-#include "simgrid/s4u/As.hpp"
-#include "simgrid/s4u/engine.hpp"
-
-#if HAVE_LUA
+#if SIMGRID_HAVE_LUA
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
 #endif
 
+SG_BEGIN_DECL()
+
 /********************************* MSG **************************************/
 
 /** \ingroup msg_simulation
@@ -38,43 +36,56 @@ void MSG_create_environment(const char *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;
 
   /* Initialize MSG storages */
   xbt_lib_foreach(storage_lib, cursor, name, data) {
-    if(data[SIMIX_STORAGE_LEVEL])
-      __MSG_storage_create(xbt_dict_cursor_get_elm(cursor));
+    __MSG_storage_create(xbt_dict_cursor_get_elm(cursor));
   }
 }
 
-msg_as_t MSG_environment_get_routing_root() {
-  return simgrid::s4u::Engine::instance()->rootAs();
+msg_netzone_t MSG_zone_get_root()
+{
+  return simgrid::s4u::Engine::instance()->netRoot();
+}
+
+const char* MSG_zone_get_name(msg_netzone_t netzone)
+{
+  return netzone->name();
 }
 
-const char *MSG_environment_as_get_name(msg_as_t as) {
-  return as->name();
+msg_netzone_t MSG_zone_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 simgrid::s4u::Engine::instance()->asByNameOrNull(name);
+void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto)
+{
+  for (auto elem : *netzone->children()) {
+    xbt_dict_set(whereto, elem->name(), static_cast<void*>(elem), nullptr);
+  }
 }
 
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
-  return as->children();
+const char* MSG_zone_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 *name)
+void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value)
 {
-  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_as_t as) {
-  return as->hosts();
+void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto)
+{
+  /* converts vector to dynar */
+  std::vector<simgrid::s4u::Host*> hosts;
+  netzone->hosts(&hosts);
+  for (auto host : hosts)
+    xbt_dynar_push(whereto, &host);
 }
+
+SG_END_DECL()