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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 42b5c7a557..0df7149ddd 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -8,11 +8,13 @@
 #include "xbt/dict.h"
 #include "portable.h"
 #include "surf_private.h"
+#include "storage_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;
+  void *net_elm;
   xbt_dynar_t storage;
 } s_workstation_CLM03_t, *workstation_CLM03_t;
 
@@ -28,8 +30,9 @@ static void workstation_new(sg_platf_host_cbarg_t host)
   workstation->generic_resource.model = surf_workstation_model;
   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;
-
+  workstation->storage = xbt_lib_get_or_null(storage_lib,host->id,ROUTING_STORAGE_HOST_LEVEL);
+  workstation->net_elm = xbt_lib_get_or_null(host_lib,host->id,ROUTING_HOST_LEVEL);
+  XBT_DEBUG("Create workstation %s with %ld mounted disks",host->id,xbt_dynar_length(workstation->storage));
   xbt_lib_set(host_lib, host->id, SURF_WKS_LEVEL, workstation);
 }
 
@@ -209,8 +212,8 @@ static surf_action_t ws_communicate(void *workstation_src,
   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(src->net_elm,
+                  dst->net_elm, size, rate);
 }
 
 static e_surf_resource_state_t ws_get_state(void *workstation)
@@ -244,10 +247,14 @@ 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)
+static xbt_dynar_t ws_get_route(void *workstation_src, void *workstation_dst)
 {
+  XBT_DEBUG("ws_get_route");
+  workstation_CLM03_t src = (workstation_CLM03_t) workstation_src;
+  workstation_CLM03_t dst = (workstation_CLM03_t) workstation_dst;
   return surf_network_model->extension.
-      network.get_route(surf_resource_name(src), surf_resource_name(dst));
+      network.get_route(src->net_elm,
+                  dst->net_elm);
 }
 
 static double ws_get_link_bandwidth(const void *link)
@@ -276,34 +283,64 @@ static xbt_dict_t ws_get_properties(const void *ws)
   return surf_resource_properties(((workstation_CLM03_t) ws)->cpu);
 }
 
-static surf_action_t ws_action_open(void *workstation, const char* path, const char* mode)
+static storage_t find_storage_on_mount_list(void *workstation,const char* storage)
+{
+  storage_t st = NULL;
+  s_mount_t mnt;
+  unsigned int cursor;
+  xbt_dynar_t storage_list = ((workstation_CLM03_t) workstation)->storage;
+
+  XBT_DEBUG("Search for storage name '%s' on '%s'",storage,((workstation_CLM03_t) workstation)->generic_resource.name);
+  xbt_dynar_foreach(storage_list,cursor,mnt)
+  {
+    XBT_DEBUG("See '%s'",mnt.name);
+    if(!strcmp(storage,mnt.name)){
+      st = mnt.id;
+      break;
+    }
+  }
+  if(!st) xbt_die("Can't find mount '%s' for '%s'",storage,((workstation_CLM03_t) workstation)->generic_resource.name);
+  return st;
+}
+
+static surf_action_t ws_action_open(void *workstation, const char* storage, const char* path, const char* mode)
 {
-  void *storage = ((workstation_CLM03_t) workstation)->storage;
-  return ((surf_resource_t) storage)->model->extension.storage.open(storage, path, mode);
+  storage_t st = find_storage_on_mount_list(workstation, storage);
+  XBT_DEBUG("OPEN on disk '%s'",st->generic_resource.name);
+  surf_model_t model = st->generic_resource.model;
+  return model->extension.storage.open(st, path, mode);
 }
 
-static surf_action_t ws_action_close(void *workstation, surf_file_t fp)
+static surf_action_t ws_action_close(void *workstation, const char* storage, m_file_t fp)
 {
-  void *storage = ((workstation_CLM03_t) workstation)->storage;
-  return ((surf_resource_t) storage)->model->extension.storage.close(storage, fp);
+  storage_t st = find_storage_on_mount_list(workstation, storage);
+  XBT_DEBUG("CLOSE on disk '%s'",st->generic_resource.name);
+  surf_model_t model = st->generic_resource.model;
+  return model->extension.storage.close(st, fp);
 }
 
-static surf_action_t ws_action_read(void *workstation, void* ptr, size_t size, size_t nmemb, surf_file_t stream)
+static surf_action_t ws_action_read(void *workstation, const char* storage, void* ptr, size_t size, size_t nmemb, m_file_t stream)
 {
-  void *storage = ((workstation_CLM03_t) workstation)->storage;
-  return ((surf_resource_t) storage)->model->extension.storage.read(storage, ptr, size, nmemb, stream);
+  storage_t st = find_storage_on_mount_list(workstation, storage);
+  XBT_DEBUG("READ on disk '%s'",st->generic_resource.name);
+  surf_model_t model = st->generic_resource.model;
+  return model->extension.storage.read(st, 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)
+static surf_action_t ws_action_write(void *workstation, const char* storage, const void* ptr, size_t size, size_t nmemb, m_file_t stream)
 {
-  void *storage = ((workstation_CLM03_t) workstation)->storage;
-  return ((surf_resource_t) storage)->model->extension.storage.write(storage, ptr, size, nmemb, stream);
+  storage_t st = find_storage_on_mount_list(workstation, storage);
+  XBT_DEBUG("WRITE on disk '%s'",st->generic_resource.name);
+  surf_model_t model = st->generic_resource.model;
+  return model->extension.storage.write(st,  ptr, size, nmemb, stream);
 }
 
-static surf_action_t ws_action_stat(void *workstation, int fd, void* buf)
+static surf_action_t ws_action_stat(void *workstation, const char* storage, int fd, void* buf)
 {
-  void *storage = ((workstation_CLM03_t) workstation)->storage;
-  return ((surf_resource_t) storage)->model->extension.storage.stat(storage, fd, buf);
+  storage_t st = find_storage_on_mount_list(workstation, storage);
+  XBT_DEBUG("STAT on disk '%s'",st->generic_resource.name);
+  surf_model_t model = st->generic_resource.model;
+  return model->extension.storage.stat(st,  fd, buf);
 }
 
 static void surf_workstation_model_init_internal(void)