X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7cb1f8f04ea7ad3bf6a0eedec6f8e28e3f961970..0ca1291c2f63ca6235f4b4885c48413a900aade4:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index ba94803a1b..9aa3304dd8 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -19,8 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
 
 surf_model_t surf_workstation_model = NULL;
 
-static workstation_CLM03_t workstation_new(const char *name,
-                                           void *cpu)
+static workstation_CLM03_t workstation_new(const char *name, void *cpu)
 {
   workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
 
@@ -28,20 +27,20 @@ static workstation_CLM03_t workstation_new(const char *name,
   workstation->generic_resource.name = xbt_strdup(name);
   workstation->cpu = cpu;
 
-  xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
-               workstation, surf_resource_free);
+  xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
 
   return workstation;
 }
 
 void create_workstations(void)
 {
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_lib_cursor_t cursor = NULL;
   char *name = NULL;
-  void *cpu = NULL;
+  void **cpu = NULL;
 
-  xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) {
-	  workstation_new(name, cpu);
+  xbt_lib_foreach(host_lib, cursor, name, cpu) {
+	  if(cpu[SURF_CPU_LEVEL])
+		  workstation_new(name, cpu[SURF_CPU_LEVEL]);
   }
 }
 
@@ -111,8 +110,8 @@ static void ws_update_actions_state(double now, double delta)
 }
 
 static void ws_update_resource_state(void *id,
-                                  tmgr_trace_event_t event_type,
-                                  double value, double date)
+                                     tmgr_trace_event_t event_type,
+                                     double value, double date)
 {
   THROW_IMPOSSIBLE;             /* This model does not implement parallel tasks */
 }
@@ -120,13 +119,13 @@ static void ws_update_resource_state(void *id,
 static surf_action_t ws_execute(void *workstation, double size)
 {
   return surf_cpu_model->extension.cpu.
-    execute(((workstation_CLM03_t) workstation)->cpu, size);
+      execute(((workstation_CLM03_t) workstation)->cpu, size);
 }
 
 static surf_action_t ws_action_sleep(void *workstation, double duration)
 {
   return surf_cpu_model->extension.cpu.
-    sleep(((workstation_CLM03_t) workstation)->cpu, duration);
+      sleep(((workstation_CLM03_t) workstation)->cpu, duration);
 }
 
 static void ws_action_suspend(surf_action_t action)
@@ -158,7 +157,8 @@ static int ws_action_is_suspended(surf_action_t action)
   DIE_IMPOSSIBLE;
 }
 
-static void ws_action_set_max_duration(surf_action_t action, double duration)
+static void ws_action_set_max_duration(surf_action_t action,
+                                       double duration)
 {
   if (action->model_type == surf_network_model)
     surf_network_model->set_max_duration(action, duration);
@@ -178,13 +178,25 @@ static void ws_action_set_priority(surf_action_t action, double priority)
     DIE_IMPOSSIBLE;
 }
 
+#ifdef HAVE_TRACING
+static void ws_action_set_category(surf_action_t action, const char *category)
+{
+  if (action->model_type == surf_network_model)
+    surf_network_model->set_category(action, category);
+  else if (action->model_type == surf_cpu_model)
+    surf_cpu_model->set_category(action, category);
+  else
+    DIE_IMPOSSIBLE;
+}
+#endif
+
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 static int ws_get_latency_limited(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
     return surf_network_model->get_latency_limited(action);
-  INFO0("You tried to ask if a non network action is limited by latency, aborting...");
-  DIE_IMPOSSIBLE;
+  else
+    return 0;
 }
 #endif
 
@@ -198,40 +210,40 @@ static double ws_action_get_remains(surf_action_t action)
 }
 
 static surf_action_t ws_communicate(void *workstation_src,
-                                 void *workstation_dst, double size,
-                                 double rate)
+                                    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),
-                size, rate);
+      communicate(surf_resource_name(src->cpu),
+                  surf_resource_name(dst->cpu), size, rate);
 }
 
 static e_surf_resource_state_t ws_get_state(void *workstation)
 {
   return surf_cpu_model->extension.cpu.
-    get_state(((workstation_CLM03_t) workstation)->cpu);
+      get_state(((workstation_CLM03_t) workstation)->cpu);
 }
 
 static double ws_get_speed(void *workstation, double load)
 {
   return surf_cpu_model->extension.cpu.
-    get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+      get_speed(((workstation_CLM03_t) workstation)->cpu, load);
 }
 
 static double ws_get_available_speed(void *workstation)
 {
   return surf_cpu_model->extension.cpu.
-    get_available_speed(((workstation_CLM03_t)
-                         workstation)->cpu);
+      get_available_speed(((workstation_CLM03_t)
+                           workstation)->cpu);
 }
 
 static surf_action_t ws_execute_parallel_task(int workstation_nb,
-                                           void **workstation_list,
-                                           double *computation_amount,
-                                           double *communication_amount,
-                                           double amount, double rate)
+                                              void **workstation_list,
+                                              double *computation_amount,
+                                              double *communication_amount,
+                                              double amount, double rate)
 {
   THROW_UNIMPLEMENTED;          /* This model does not implement parallel tasks */
 }
@@ -240,8 +252,8 @@ static surf_action_t ws_execute_parallel_task(int workstation_nb,
 /* returns an array of network_link_CM02_t */
 static xbt_dynar_t ws_get_route(void *src, void *dst)
 {
-  return surf_network_model->extension.network.get_route(surf_resource_name(src),
-			 surf_resource_name(src));
+  return surf_network_model->extension.
+      network.get_route(surf_resource_name(src), surf_resource_name(src));
 }
 
 static double ws_get_link_bandwidth(const void *link)
@@ -280,11 +292,12 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->action_state_set = ws_action_state_set;
 
   surf_workstation_model->model_private->resource_used = ws_resource_used;
-  surf_workstation_model->model_private->share_resources = ws_share_resources;
+  surf_workstation_model->model_private->share_resources =
+      ws_share_resources;
   surf_workstation_model->model_private->update_actions_state =
-    ws_update_actions_state;
+      ws_update_actions_state;
   surf_workstation_model->model_private->update_resource_state =
-    ws_update_resource_state;
+      ws_update_resource_state;
   surf_workstation_model->model_private->finalize = ws_finalize;
 
   surf_workstation_model->suspend = ws_action_suspend;
@@ -292,6 +305,9 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->is_suspended = ws_action_is_suspended;
   surf_workstation_model->set_max_duration = ws_action_set_max_duration;
   surf_workstation_model->set_priority = ws_action_set_priority;
+#ifdef HAVE_TRACING
+  surf_workstation_model->set_category = ws_action_set_category;
+#endif
   surf_workstation_model->get_remains = ws_action_get_remains;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   surf_workstation_model->get_latency_limited = ws_get_latency_limited;
@@ -302,19 +318,21 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_state = ws_get_state;
   surf_workstation_model->extension.workstation.get_speed = ws_get_speed;
   surf_workstation_model->extension.workstation.get_available_speed =
-    ws_get_available_speed;
+      ws_get_available_speed;
 
-  surf_workstation_model->extension.workstation.communicate = ws_communicate;
+  surf_workstation_model->extension.workstation.communicate =
+      ws_communicate;
   surf_workstation_model->extension.workstation.get_route = ws_get_route;
   surf_workstation_model->extension.workstation.execute_parallel_task =
-    ws_execute_parallel_task;
+      ws_execute_parallel_task;
   surf_workstation_model->extension.workstation.get_link_bandwidth =
-    ws_get_link_bandwidth;
+      ws_get_link_bandwidth;
   surf_workstation_model->extension.workstation.get_link_latency =
-    ws_get_link_latency;
-  surf_workstation_model->extension.workstation.link_shared = ws_link_shared;
+      ws_get_link_latency;
+  surf_workstation_model->extension.workstation.link_shared =
+      ws_link_shared;
   surf_workstation_model->extension.workstation.get_properties =
-    ws_get_properties;
+      ws_get_properties;
 
 }
 
@@ -342,8 +360,8 @@ void surf_workstation_model_init_CLM03(const char *filename)
 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!");
+  xbt_assert(surf_cpu_model, "No CPU model defined yet!");
+  xbt_assert(surf_network_model, "No network model defined yet!");
   surf_workstation_model_init_internal();
 
   update_model_description(surf_workstation_model_description,