The interaction between the parser and the surf modules makes more sense now.

[simgrid.git] / src / simix / smx_environment.c

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 8ce4451..1198f5a 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -9,6 +9,8 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"

+#include "xbt/xbt_os_time.h"
+

 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
                                "Logging specific to SIMIX (environment)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
                                "Logging specific to SIMIX (environment)");
 


@@ -36,9 +38,10 @@ void SIMIX_create_environment(const char *file)
   void *workstation = NULL;
   char *workstation_model_name;
   int workstation_id = -1;
   void *workstation = NULL;
   char *workstation_model_name;
   int workstation_id = -1;

+  double start, end;

 
   simix_config_init();         /* make sure that our configuration set is created */
 
   simix_config_init();         /* make sure that our configuration set is created */

-  surf_timer_resource_init(file);
+  surf_timer_model_init(file);

 
   /* which model do you want today? */
   workstation_model_name =
 
   /* which model do you want today? */
   workstation_model_name =


@@ -46,8 +49,8 @@ void SIMIX_create_environment(const char *file)
 
   DEBUG1("Model : %s", workstation_model_name);
   workstation_id =
 
   DEBUG1("Model : %s", workstation_model_name);
   workstation_id =

-      find_resource_description(surf_workstation_resource_description,
-                               surf_workstation_resource_description_size,
+      find_model_description(surf_workstation_model_description,
+                               surf_workstation_model_description_size,

                                workstation_model_name);
   if (!strcmp(workstation_model_name, "compound")) {
     xbt_ex_t e;
                                workstation_model_name);
   if (!strcmp(workstation_model_name, "compound")) {
     xbt_ex_t e;


@@ -83,20 +86,29 @@ void SIMIX_create_environment(const char *file)
     }
 
     network_id =
     }
 
     network_id =

-       find_resource_description(surf_network_resource_description,
-                                 surf_network_resource_description_size,
+       find_model_description(surf_network_model_description,
+                                 surf_network_model_description_size,

                                  network_model_name);
     cpu_id =
                                  network_model_name);
     cpu_id =

-       find_resource_description(surf_cpu_resource_description,
-                                 surf_cpu_resource_description_size,
+       find_model_description(surf_cpu_model_description,
+                                 surf_cpu_model_description_size,

                                  cpu_model_name);
 
                                  cpu_model_name);
 

-    surf_cpu_resource_description[cpu_id].resource_init(file);
-    surf_network_resource_description[network_id].resource_init(file);
-  }
+    surf_cpu_model_description[cpu_id].model_init(file);
+    surf_network_model_description[network_id].model_init(file);
+
+
+  } 
+  surf_workstation_model_description[workstation_id].
+    model_init(file);
+
+  start = xbt_os_time();
+  parse_platform_file(file);

 
 

-  surf_workstation_resource_description[workstation_id].
-      resource_init(file);
+  if (surf_workstation_model_description[workstation_id].create_ws != NULL)
+    surf_workstation_model_description[workstation_id].create_ws();
+  end = xbt_os_time();
+  DEBUG1("PARSE TIME: %lg", (end-start));

 
   _simix_init_status = 2;      /* inited; don't change settings now */
 
 
   _simix_init_status = 2;      /* inited; don't change settings now */