Merge changes of maxmin_selective_update branch into the trunk.

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index ce87967..4b3ec78 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -9,10 +9,9 @@
 #include "xbt/dict.h"
 #include "portable.h"
 #include "surf_private.h"
-#include "network_common.h"
 
 typedef struct workstation_CLM03 {
-  s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
+  s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
   void *cpu;
   int id;
 } s_workstation_CLM03_t, *workstation_CLM03_t;
@@ -45,10 +44,11 @@ void create_workstations(void)
   void *cpu = NULL;
 
   xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) {
-    int *id = xbt_dict_get_or_null(used_routing->host_id,name);
-    xbt_assert1(id, "No host %s found in the platform file", name);
+    int *id = NULL;
+    if (used_routing && used_routing->host_id)
+      id = xbt_dict_get_or_null(used_routing->host_id,name);
 
-    workstation_new(name, cpu, *id);
+    workstation_new(name, cpu, id ? *id : 0);
   }
 }
 
@@ -126,14 +126,14 @@ static void update_resource_state(void *id,
 
 static surf_action_t execute(void *workstation, double size)
 {
-  return surf_cpu_model->extension.
-    cpu.execute(((workstation_CLM03_t) workstation)->cpu, size);
+  return surf_cpu_model->extension.cpu.
+    execute(((workstation_CLM03_t) workstation)->cpu, size);
 }
 
 static surf_action_t action_sleep(void *workstation, double duration)
 {
-  return surf_cpu_model->extension.
-    cpu.sleep(((workstation_CLM03_t) workstation)->cpu, duration);
+  return surf_cpu_model->extension.cpu.
+    sleep(((workstation_CLM03_t) workstation)->cpu, duration);
 }
 
 static void action_suspend(surf_action_t action)
@@ -185,41 +185,43 @@ static void action_set_priority(surf_action_t action, double priority)
     DIE_IMPOSSIBLE;
 }
 
+static double action_get_remains(surf_action_t action)
+{
+  if (action->model_type == surf_network_model)
+    return surf_network_model->get_remains(action);
+  if (action->model_type == surf_cpu_model)
+    return surf_cpu_model->get_remains(action);
+  DIE_IMPOSSIBLE;
+}
+
 static surf_action_t communicate(void *workstation_src,
                                  void *workstation_dst, double size,
                                  double rate)
 {
   workstation_CLM03_t src = (workstation_CLM03_t) workstation_src;
   workstation_CLM03_t dst = (workstation_CLM03_t) workstation_dst;
-  return surf_network_model->extension.
-    network.communicate(surf_resource_name(src->cpu),surf_resource_name(dst->cpu),
-        src->id,dst->id,
-        size, rate);
+  return surf_network_model->extension.network.
+    communicate(surf_resource_name(src->cpu), surf_resource_name(dst->cpu),
+                src->id, dst->id, size, rate);
 }
 
-static e_surf_cpu_state_t get_state(void *workstation)
+static e_surf_resource_state_t get_state(void *workstation)
 {
-  return surf_cpu_model->extension.
-    cpu.get_state(((workstation_CLM03_t) workstation)->cpu);
+  return surf_cpu_model->extension.cpu.
+    get_state(((workstation_CLM03_t) workstation)->cpu);
 }
 
 static double get_speed(void *workstation, double load)
 {
-  return surf_cpu_model->extension.
-    cpu.get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+  return surf_cpu_model->extension.cpu.
+    get_speed(((workstation_CLM03_t) workstation)->cpu, load);
 }
 
 static double get_available_speed(void *workstation)
 {
-  return surf_cpu_model->extension.
-    cpu.get_available_speed(((workstation_CLM03_t)
-                             workstation)->cpu);
-}
-
-static xbt_dict_t get_properties(void *workstation)
-{
-  return surf_cpu_model->get_properties(((workstation_CLM03_t) workstation)->
-                                        cpu);
+  return surf_cpu_model->extension.cpu.
+    get_available_speed(((workstation_CLM03_t)
+                         workstation)->cpu);
 }
 
 static surf_action_t execute_parallel_task(int workstation_nb,
@@ -262,6 +264,11 @@ static void finalize(void)
   surf_workstation_model = NULL;
 }
 
+static xbt_dict_t get_properties(const void *ws)
+{
+  return surf_resource_properties(((workstation_CLM03_t) ws)->cpu);
+}
+
 static void surf_workstation_model_init_internal(void)
 {
   surf_workstation_model = surf_model_init();
@@ -284,6 +291,7 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->is_suspended = action_is_suspended;
   surf_workstation_model->set_max_duration = action_set_max_duration;
   surf_workstation_model->set_priority = action_set_priority;
+  surf_workstation_model->get_remains = action_get_remains;
 
   surf_workstation_model->extension.workstation.execute = execute;
   surf_workstation_model->extension.workstation.sleep = action_sleep;
@@ -292,9 +300,6 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_available_speed =
     get_available_speed;
 
-  /*manage the properties of the workstation */
-  surf_workstation_model->get_properties = get_properties;
-
   surf_workstation_model->extension.workstation.communicate = communicate;
   surf_workstation_model->extension.workstation.get_route = get_route;
   surf_workstation_model->extension.workstation.execute_parallel_task =
@@ -304,6 +309,8 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_link_latency =
     get_link_latency;
   surf_workstation_model->extension.workstation.link_shared = link_shared;
+  surf_workstation_model->extension.workstation.get_properties =
+    get_properties;
 }
 
 /********************************************************************/