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

diff --git a/src/msg/environment.c b/src/msg/environment.c
index e0644ec869..633995ff9e 100644
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -1,15 +1,28 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. 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. */
 
-#include"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(environment, msg,
-				"Logging specific to MSG (environment)");
+#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 **************************************/
 
@@ -22,16 +35,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(environment, msg,
  */
 m_host_t MSG_get_host_by_name(const char *name)
 {
-  xbt_fifo_item_t i = NULL;
-  m_host_t host = NULL;
+  smx_host_t simix_h = NULL;
+  simix_h = SIMIX_req_host_get_by_name(name);
 
-  xbt_assert0(((msg_global != NULL)
-	  && (msg_global->host != NULL)), "Environment not set yet");
+  if (simix_h == NULL)
+    return NULL;
 
-  xbt_fifo_foreach(msg_global->host,i,host,m_host_t) {
-    if(strcmp(host->name, name) == 0) return host;
-  }
-  return NULL;
+  return (m_host_t) SIMIX_req_host_get_data(simix_h);
 }
 
 /** \ingroup msg_easier_life
@@ -39,29 +49,52 @@ m_host_t MSG_get_host_by_name(const char *name)
  *
  * Creates a new platform, including hosts, links and the
  * routing_table. 
- * \param file a filename of a description of a platform. This file is a simple text 
- * file in which you can use C-style comments and C-style strings.
- * Here is a simple description of the format:
- \verbatim
-<CPU>
-host_name "power in MFlops" "availability" "availability file" ON/OFF "failure file"
-host_name "power in MFlops" "availability" "availability file" ON/OFF "failure file"
-...
-</LINKS>
-link_name "bandwidth in Mbytes" "bandwidth file" "latency in ms" "latency file"
-link_name "bandwidth in Mbytes" "bandwidth file" "latency in ms" "latency file"
-...
-ROUTES
-src_name dst_name (link_name link_name link_name ... )
-src_name dst_name (link_name link_name link_name ... )
-...
-\endverbatim
- * Have a look in the directory examples/msg/ to have a better idea of what
- * it looks like.
+ * \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 
+ *
+ *     \include small_platform.xml
+ *
+ * Have a look in the directory examples/msg/ to have a big example.
  */
-void MSG_create_environment(const char *file) {
-  surf_workstation_resource_init(file);
+void MSG_create_environment(const char *file)
+{
+  xbt_dict_cursor_t c;
+  smx_host_t h;
+  char *name;
+
+  SIMIX_create_environment(file);
 
+  /* Initialize MSG hosts */
+  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;
+  }
+#else
+  xbt_die
+      ("Lua is not available!! to call MSG_load_platform_script, lua should be available...");
+#endif
+  return;
+}