various cleanups

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index f9a3ac3..ccca244 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -7,6 +7,7 @@
 
 #include "xbt/ex.h"
 #include "xbt/dict.h"
+#include "gras_config.h"
 #include "workstation_private.h"
 #include "cpu_private.h"
 #include "network_private.h"
@@ -161,10 +162,10 @@ static void update_actions_state(double now, double delta)
   */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
-    surf_double_update(&(action->generic_action.remains),
+    double_update(&(action->generic_action.remains),
        lmm_variable_getvalue(action->variable) * delta);
     if (action->generic_action.max_duration != NO_MAX_DURATION)
-      surf_double_update(&(action->generic_action.max_duration), delta);
+      double_update(&(action->generic_action.max_duration), delta);
     if ((action->generic_action.remains <= 0) && 
        (lmm_get_variable_weight(action->variable)>0)) {
       action->generic_action.finish = surf_get_clock();
@@ -296,6 +297,16 @@ static double get_available_speed(void *workstation)
       get_available_speed(((workstation_CLM03_t) workstation)->cpu);
 }
 
+static surf_action_t execute_parallel_task_bogus (int workstation_nb,
+                                           void **workstation_list,
+                                           double *computation_amount,
+                                           double *communication_amount,
+                                           double amount,
+                                           double rate)
+{
+  xbt_assert0(0,"This model does not implement parallel tasks");
+}
+
 static surf_action_t execute_parallel_task (int workstation_nb,
                                            void **workstation_list,
                                            double *computation_amount,
@@ -491,7 +502,7 @@ static void surf_workstation_resource_init_internal(void)
   surf_workstation_resource->extension_public->get_available_speed = get_available_speed;
   surf_workstation_resource->extension_public->communicate = communicate;
   surf_workstation_resource->extension_public->execute_parallel_task = 
-    execute_parallel_task;
+    execute_parallel_task_bogus;
   surf_workstation_resource->extension_public->get_route = get_route;
   surf_workstation_resource->extension_public->get_route_size = get_route_size;
   surf_workstation_resource->extension_public->get_link_name = get_link_name;
@@ -515,24 +526,29 @@ static void surf_workstation_resource_init_internal(void)
 /* } */
 void surf_workstation_resource_init_CLM03(const char *filename)
 {
-/*   int i ; */
-/*   surf_resource_t resource =  NULL; */
-
   surf_workstation_resource_init_internal();
   surf_cpu_resource_init_Cas01(filename);
   surf_network_resource_init_CM02(filename);
   create_workstations();
+  update_resource_description(surf_workstation_resource_description,
+                             surf_workstation_resource_description_size,
+                             "CLM03",
+                             (surf_resource_t) surf_workstation_resource);
+  xbt_dynar_push(resource_list, &surf_workstation_resource);
+}
+
+void surf_workstation_resource_init_compound(const char *filename)
+{
+
+  xbt_assert0(surf_cpu_resource,"No CPU resource defined yet!");
+  xbt_assert0(surf_network_resource,"No network resource defined yet!");
+  surf_workstation_resource_init_internal();
+  create_workstations();
+
+  update_resource_description(surf_workstation_resource_description,
+                             surf_workstation_resource_description_size,
+                             "compound",
+                             (surf_resource_t) surf_workstation_resource);
+
   xbt_dynar_push(resource_list, &surf_workstation_resource);
-/*   xbt_dynar_foreach(resource_list, i, resource) { */
-/*     if(resource==surf_cpu_resource) { */
-/*       xbt_dynar_remove_at(resource_list, i, NULL); */
-/*       i--;  */
-/*       continue; */
-/*     } */
-/*     if(resource==surf_network_resource) { */
-/*       xbt_dynar_remove_at(resource_list, i, NULL); */
-/*       i--;  */
-/*       continue; */
-/*     } */
-/*   } */
 }