Don't define variables in header file.!

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

diff --git a/src/msg/msg_environment.c b/src/msg/msg_environment.c
index 93f479f..497b254 100644 (file)
--- a/src/msg/msg_environment.c
+++ b/src/msg/msg_environment.c
@@ -7,44 +7,16 @@
 #include "msg_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/dict.h"
+
 #ifdef HAVE_LUA
 #include <lua.h>
 #include <lauxlib.h>
 #include <lualib.h>
 #endif
-//#endif
-/** \defgroup msg_easier_life      Platform and Application management
- *  \brief This section describes functions to manage the platform creation
- *  and the application deployment. You should also have a look at 
- *  \ref MSG_examples  to have an overview of their usage.
- */
-/** @addtogroup msg_easier_life
- *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Platforms and Applications" --> \endhtmlonly
- * 
- */
 
 /********************************* MSG **************************************/
 
-/** \ingroup msg_easier_life
- * \brief A name directory service...
- *
- * Finds a m_host_t using its name.
- * \param name the name of an host.
- * \return the corresponding host
- */
-m_host_t MSG_get_host_by_name(const char *name)
-{
-  smx_host_t simix_h = NULL;
-  simix_h = SIMIX_req_host_get_by_name(name);
-
-  if (simix_h == NULL)
-    return NULL;
-
-  return (m_host_t) SIMIX_req_host_get_data(simix_h);
-}
-
-/** \ingroup msg_easier_life
+/** \ingroup msg_simulation
  * \brief A platform constructor.
  *
  * Creates a new platform, including hosts, links and the
@@ -62,38 +34,17 @@ m_host_t MSG_get_host_by_name(const char *name)
  */
 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;
 
-  SIMIX_create_environment(file);
-
   /* Initialize MSG hosts */
   xbt_lib_foreach(host_lib, cursor, name, data) {
     if(data[SIMIX_HOST_LEVEL])
-      __MSG_host_create((smx_host_t)data[SIMIX_HOST_LEVEL], NULL);
-  }
-}
-
-/**
- * \brief A platform constructor bypassing the parser.
- *
- * load lua script file to set up new platform, including hosts,links
- * and the routing table
- */
-
-void MSG_load_platform_script(const char *script_file)
-{
-#ifdef HAVE_LUA
-  lua_State *L = lua_open();
-  luaL_openlibs(L);
-
-  if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
-    printf("error: %s\n", lua_tostring(L, -1));
-    return;
+      __MSG_host_create(xbt_dict_cursor_get_elm(cursor));
   }
-#else
-  xbt_die
-      ("Lua is not available!! to call MSG_load_platform_script, lua should be available...");
-#endif
 }