X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40f248ed1c13510a3eb82dea178406c8104dd2f1..c775b15953dcbe0cd45f46671962b513792ddaca:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 2c7319421f..42b5c7a557 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -10,11 +10,10 @@
 #include "surf_private.h"
 #include "surf/surf_resource.h"
 
-
-
 typedef struct workstation_CLM03 {
   s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
   void *cpu;
+  xbt_dynar_t storage;
 } s_workstation_CLM03_t, *workstation_CLM03_t;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
@@ -22,29 +21,16 @@ 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 void workstation_new(sg_platf_host_cbarg_t host)
 {
   workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
 
   workstation->generic_resource.model = surf_workstation_model;
-  workstation->generic_resource.name = xbt_strdup(name);
-  workstation->cpu = cpu;
-
-  xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
-
-  return workstation;
-}
-
-void create_workstations(void)
-{
-  xbt_lib_cursor_t cursor = NULL;
-  char *name = NULL;
-  void **cpu = NULL;
+  workstation->generic_resource.name = xbt_strdup(host->id);
+  workstation->cpu = xbt_lib_get_or_null(host_lib, host->id, SURF_CPU_LEVEL);
+  workstation->storage = NULL;
 
-  xbt_lib_foreach(host_lib, cursor, name, cpu) {
-	  if(cpu[SURF_CPU_LEVEL])
-		  workstation_new(name, cpu[SURF_CPU_LEVEL]);
-  }
+  xbt_lib_set(host_lib, host->id, SURF_WKS_LEVEL, workstation);
 }
 
 static int ws_resource_used(void *resource_id)
@@ -123,8 +109,8 @@ 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);
+  void *cpu = ((workstation_CLM03_t) workstation)->cpu;
+  return ((surf_resource_t) cpu)->model->extension.cpu.execute(cpu, size);
 }
 
 static surf_action_t ws_action_sleep(void *workstation, double duration)
@@ -276,7 +262,7 @@ static double ws_get_link_latency(const void *link)
 
 static int ws_link_shared(const void *link)
 {
-  return surf_network_model->extension.network.get_link_latency(link);
+  return surf_network_model->extension.network.link_shared(link);
 }
 
 static void ws_finalize(void)
@@ -292,32 +278,32 @@ static xbt_dict_t ws_get_properties(const void *ws)
 
 static surf_action_t ws_action_open(void *workstation, const char* path, const char* mode)
 {
-  return surf_cpu_model->extension.cpu.
-      sleep(((workstation_CLM03_t) workstation)->cpu, 1);
+  void *storage = ((workstation_CLM03_t) workstation)->storage;
+  return ((surf_resource_t) storage)->model->extension.storage.open(storage, path, mode);
 }
 
 static surf_action_t ws_action_close(void *workstation, surf_file_t fp)
 {
-  return surf_cpu_model->extension.cpu.
-      sleep(((workstation_CLM03_t) workstation)->cpu, 2);
+  void *storage = ((workstation_CLM03_t) workstation)->storage;
+  return ((surf_resource_t) storage)->model->extension.storage.close(storage, fp);
 }
 
 static surf_action_t ws_action_read(void *workstation, void* ptr, size_t size, size_t nmemb, surf_file_t stream)
 {
-  return surf_cpu_model->extension.cpu.
-      sleep(((workstation_CLM03_t) workstation)->cpu, 3);
+  void *storage = ((workstation_CLM03_t) workstation)->storage;
+  return ((surf_resource_t) storage)->model->extension.storage.read(storage, ptr, size, nmemb, stream);
 }
 
 static surf_action_t ws_action_write(void *workstation, const void* ptr, size_t size, size_t nmemb, surf_file_t stream)
 {
-  return surf_cpu_model->extension.cpu.
-      sleep(((workstation_CLM03_t) workstation)->cpu, 4);
+  void *storage = ((workstation_CLM03_t) workstation)->storage;
+  return ((surf_resource_t) storage)->model->extension.storage.write(storage, ptr, size, nmemb, stream);
 }
 
 static surf_action_t ws_action_stat(void *workstation, int fd, void* buf)
 {
-  return surf_cpu_model->extension.cpu.
-      sleep(((workstation_CLM03_t) workstation)->cpu, 5);
+  void *storage = ((workstation_CLM03_t) workstation)->storage;
+  return ((surf_resource_t) storage)->model->extension.storage.stat(storage, fd, buf);
 }
 
 static void surf_workstation_model_init_internal(void)
@@ -387,7 +373,8 @@ void surf_workstation_model_init_current_default(void)
   surf_network_model_init_LegrandVelho();
 
   xbt_dynar_push(model_list, &surf_workstation_model);
-  sg_platf_postparse_add_cb(create_workstations);
+  sg_platf_host_add_cb(workstation_new);
+//  sg_platf_postparse_add_cb(create_workstations);
 }
 
 void surf_workstation_model_init_compound()
@@ -397,5 +384,6 @@ void surf_workstation_model_init_compound()
   xbt_assert(surf_network_model, "No network model defined yet!");
   surf_workstation_model_init_internal();
   xbt_dynar_push(model_list, &surf_workstation_model);
-  sg_platf_postparse_add_cb(create_workstations);
+  sg_platf_host_add_cb(workstation_new);
+//  sg_platf_postparse_add_cb(create_workstations);
 }