X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..f5fd55f293d7e019e8c23e7ff76e2b3743e40cd6:/src/msg/environment.c

diff --git a/src/msg/environment.c b/src/msg/environment.c
index 8d17dc04af..633995ff9e 100644
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -8,7 +8,12 @@
 #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 
@@ -31,12 +36,12 @@
 m_host_t MSG_get_host_by_name(const char *name)
 {
   smx_host_t simix_h = NULL;
-  simix_h = SIMIX_host_get_by_name(name);
-  
+  simix_h = SIMIX_req_host_get_by_name(name);
+
   if (simix_h == NULL)
     return NULL;
 
-  return (m_host_t)SIMIX_host_get_data(simix_h);
+  return (m_host_t) SIMIX_req_host_get_data(simix_h);
 }
 
 /** \ingroup msg_easier_life
@@ -62,7 +67,6 @@ void MSG_create_environment(const char *file)
   char *name;
 
   SIMIX_create_environment(file);
-  SIMIX_init();
 
   /* Initialize MSG hosts */
   xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) {
@@ -70,3 +74,27 @@ void MSG_create_environment(const char *file)
   }
   return;
 }
+
+/**
+ * \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;
+  }
+#else
+  xbt_die
+      ("Lua is not available!! to call MSG_load_platform_script, lua should be available...");
+#endif
+  return;
+}