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

diff --git a/src/msg/environment.c b/src/msg/environment.c
index 066ca48b38..633995ff9e 100644
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -1,8 +1,5 @@
-/*     $Id$      */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
-/* Copyright (c) 2007 Bruno Donassolo.                                      */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
@@ -10,7 +7,13 @@
 #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 
@@ -33,12 +36,12 @@
 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);
 
-  simix_h = SIMIX_host_get_by_name(name);
-  if (simix_h == NULL) {
+  if (simix_h == NULL)
     return NULL;
-  } else
-    return (m_host_t) simix_h->data;
+
+  return (m_host_t) SIMIX_req_host_get_data(simix_h);
 }
 
 /** \ingroup msg_easier_life
@@ -59,16 +62,39 @@ m_host_t MSG_get_host_by_name(const char *name)
  */
 void MSG_create_environment(const char *file)
 {
-  smx_host_t *workstation = NULL;
-  int i;
+  xbt_dict_cursor_t c;
+  smx_host_t h;
+  char *name;
 
   SIMIX_create_environment(file);
 
   /* Initialize MSG hosts */
-  workstation = SIMIX_host_get_table();
-  for (i = 0; i < SIMIX_host_get_number(); i++) {
-    __MSG_host_create(workstation[i], NULL);
+  xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) {
+    __MSG_host_create(h, NULL);
+  }
+  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;
   }
-  xbt_free(workstation);
+#else
+  xbt_die
+      ("Lua is not available!! to call MSG_load_platform_script, lua should be available...");
+#endif
   return;
 }