X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..33bd120ba8c9d8906343ed3410bc77da4ba72b2a:/src/msg/msg_environment.cpp

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index b9c604a6d9..2b995a4ce3 100644
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -1,32 +1,29 @@
-/* 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/msg.h"
 
-#ifdef HAVE_LUA
+#if SIMGRID_HAVE_LUA
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
 #endif
 
+extern "C" {
+
 /********************************* MSG **************************************/
 
 /** \ingroup msg_simulation
  * \brief A platform constructor.
  *
- * Creates a new platform, including hosts, links and the
- * routing_table. 
- * \param file a filename of a xml description of a platform. This file 
- * follows this DTD :
+ * Creates a new platform, including hosts, links and the routing_table.
+ * \param file a filename of a xml description of a platform. This file follows this DTD :
  *
  *     \include simgrid.dtd
  *
- * Here is a small example of such a platform 
+ * Here is a small example of such a platform
  *
  *     \include small_platform.xml
  *
@@ -37,44 +34,4 @@ void MSG_create_environment(const char *file)
   SIMIX_create_environment(file);
 }
 
-void MSG_post_create_environment(void) {
-  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_as_t MSG_environment_get_routing_root() {
-  return surf_AS_get_routing_root();
-}
-
-const char *MSG_environment_as_get_name(msg_as_t as) {
-  return surf_AS_get_name(as);
-}
-
-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_as_t as) {
-  xbt_dict_t res = surf_AS_get_routing_sons(as);
-  return res;
-}
-
-const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
-{
-  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);
-}
-
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
-  return surf_AS_get_hosts(as);
 }