Fix some conflicts with modifications introduced in the svn branch

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

diff --git a/src/msg/environment.c b/src/msg/environment.c
index bc57bc6..fa6accc 100644 (file)
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -1,15 +1,16 @@
 /*     $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 "msg/private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
 
 /** \defgroup msg_easier_life      Platform and Application management
  *  \brief This section describes functions to manage the platform creation
@@ -32,13 +33,13 @@
  */
 m_host_t MSG_get_host_by_name(const char *name)
 {
-       smx_host_t simix_h = NULL;
+  smx_host_t simix_h = NULL;
+  simix_h = SIMIX_host_get_by_name(name);
+  
+  if (simix_h == NULL)
+    return NULL;
 
-       simix_h = SIMIX_host_get_by_name(name);
-       if (simix_h == NULL) {
-               return NULL;
-       }
-       else return (m_host_t)simix_h->data;
+  return (m_host_t)SIMIX_host_get_data(simix_h);
 }
 
 /** \ingroup msg_easier_life
@@ -49,7 +50,7 @@ m_host_t MSG_get_host_by_name(const char *name)
  * \param file a filename of a xml description of a platform. This file 
  * follows this DTD :
  *
- *     \include surfxml.dtd
+ *     \include simgrid.dtd
  *
  * Here is a small example of such a platform 
  *
@@ -57,19 +58,18 @@ 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) 
+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);
+  SIMIX_create_environment(file);
+  SIMIX_init();
 
-       /* 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);
+  /* Initialize MSG hosts */
+  xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) {
+    __MSG_host_create(h, NULL);
+  }
   return;
 }
-