X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/911f3385e7f85f79a3b4c8f50380dcf217b30501..39c6a42ab89e515e5be6f68c11cd3ba98b85cb47:/src/msg/environment.c

diff --git a/src/msg/environment.c b/src/msg/environment.c
index ee94d94ab4..bc57bc694f 100644
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -1,21 +1,25 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/*     $Id$      */
+  
+/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
+/* Copyright (c) 2007 Bruno Donassolo.                                      */
+/* 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"
 
 /** \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 **************************************/
 
@@ -28,16 +32,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;
 
-  xbt_assert0(((msg_global != NULL)
-	  && (msg_global->host != NULL)), "Environment not set yet");
-
-  xbt_fifo_foreach(msg_global->host,i,host,m_host_t) {
-    if(strcmp(host->name, name) == 0) return host;
-  }
-  return NULL;
+	simix_h = SIMIX_host_get_by_name(name);
+	if (simix_h == NULL) {
+		return NULL;
+	}
+	else return (m_host_t)simix_h->data;
 }
 
 /** \ingroup msg_easier_life
@@ -56,22 +57,19 @@ m_host_t MSG_get_host_by_name(const char *name)
  *
  * Have a look in the directory examples/msg/ to have a big example.
  */
-void MSG_create_environment(const char *file) {
-  xbt_dict_cursor_t cursor = NULL;
-  char *name = NULL;
-  void *workstation = NULL;
-
-  surf_timer_resource_init(file);
-#ifdef ALVIN_SURF_SPECIAL
-  surf_workstation_resource_init_KCCFLN05(file);
-#else
-  surf_workstation_resource_init_CLM03(file);
-#endif
+void MSG_create_environment(const char *file) 
+{
+  smx_host_t *workstation = NULL;
+	int i;
 
-  xbt_dict_foreach(workstation_set, cursor, name, workstation) {
-    __MSG_host_create(name, workstation, NULL);
-  }
+	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_free(workstation);
   return;
 }