X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6e9085979401423afcde6d001562b6ffd23021e8..6094020a03f9c10b954e3e1d32e1a3ffc75a8d7f:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 1d154ba66e..5e494826d7 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -27,21 +27,20 @@ static workstation_CLM03_t workstation_new(const char *name, void *cpu)
   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]);
   }
 }
 
@@ -196,9 +195,8 @@ 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