move set_list initialization to where initializations are done

[simgrid.git] / src / surf / workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 8229535..177145b 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -10,7 +10,7 @@
 #include "portable.h"
 #include "workstation_private.h"
 #include "cpu_private.h"
-#include "network_private.h"
+#include "network_common.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                "Logging specific to the SURF workstation module");
@@ -159,7 +159,7 @@ static void update_actions_state(double now, double delta)
 
 static void update_resource_state(void *id,
                                  tmgr_trace_event_t event_type,
-                                 double value)
+                                 double value, double date)
 {
   THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
 }
@@ -427,11 +427,9 @@ void surf_workstation_model_init_CLM03(const char *filename)
   surf_workstation_model_init_internal();
   surf_cpu_model_init_Cas01(filename);
   surf_network_model_init_CM02(filename);
-//  create_workstations();
   update_model_description(surf_workstation_model_description,
-                             surf_workstation_model_description_size,
-                             "CLM03",
-                             (surf_model_t) surf_workstation_model);
+                          "CLM03",
+                          (surf_model_t) surf_workstation_model);
   xbt_dynar_push(model_list, &surf_workstation_model);
 }
 
@@ -441,12 +439,10 @@ void surf_workstation_model_init_compound(const char *filename)
   xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
   xbt_assert0(surf_network_model, "No network model defined yet!");
   surf_workstation_model_init_internal();
-  create_workstations();
 
   update_model_description(surf_workstation_model_description,
-                             surf_workstation_model_description_size,
-                             "compound",
-                             (surf_model_t) surf_workstation_model);
+                          "compound",
+                          (surf_model_t) surf_workstation_model);
 
   xbt_dynar_push(model_list, &surf_workstation_model);
 }