X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e6224ecd95ff7b6452fe9b2c088138877797542..59c2ae3e710d06c54ba40fff2d290b7351fb7665:/src/surf/workstation.c

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 9496b25d77..187b5a0642 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -357,7 +357,7 @@ static storage_t find_storage_on_mount_list(void *workstation,const char* mount)
   {
     XBT_DEBUG("See '%s'",mnt.name);
     if(!strcmp(mount,mnt.name)){
-      st = mnt.id;
+      st = mnt.storage;
       break;
     }
   }
@@ -365,6 +365,22 @@ static storage_t find_storage_on_mount_list(void *workstation,const char* mount)
   return st;
 }
 
+static xbt_dynar_t ws_get_storage_list(void *workstation)
+{
+  s_mount_t mnt;
+  unsigned int i;
+  xbt_dynar_t storage_list = xbt_dynar_new(sizeof(char*), NULL);
+
+  workstation_CLM03_t ws = (workstation_CLM03_t) surf_workstation_resource_priv(workstation);
+  xbt_dynar_t storages = ws->storage;
+
+  xbt_dynar_foreach(storages,i,mnt)
+  {
+    xbt_dynar_push(storage_list, &mnt.name);
+  }
+  return storage_list;
+}
+
 static surf_action_t ws_action_open(void *workstation, const char* mount,
                                     const char* path)
 {
@@ -443,6 +459,31 @@ static size_t ws_file_get_size(void *workstation, surf_file_t fd)
   return fd->size;
 }
 
+static xbt_dynar_t ws_file_get_info(void *workstation, surf_file_t fd)
+{
+  storage_t st = find_storage_on_mount_list(workstation, fd->mount);
+  xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL);
+  xbt_dynar_push_as(info, void *, (void*)fd->size);
+  xbt_dynar_push_as(info, void *, fd->mount);
+  xbt_dynar_push_as(info, void *, st->generic_resource.name);
+  xbt_dynar_push_as(info, void *, st->type_id);
+  xbt_dynar_push_as(info, void *, st->content_type);
+
+  return info;
+}
+
+static size_t ws_storage_get_free_size(void *workstation,const char* name)
+{
+  storage_t st = find_storage_on_mount_list(workstation, name);
+  return st->size - st->used_size;
+}
+
+static size_t ws_storage_get_used_size(void *workstation,const char* name)
+{
+  storage_t st = find_storage_on_mount_list(workstation, name);
+  return st->used_size;
+}
+
 static void surf_workstation_model_init_internal(void)
 {
   surf_workstation_model = surf_model_init();
@@ -508,12 +549,16 @@ static void surf_workstation_model_init_internal(void)
   surf_workstation_model->extension.workstation.unlink = ws_file_unlink;
   surf_workstation_model->extension.workstation.ls = ws_action_ls;
   surf_workstation_model->extension.workstation.get_size = ws_file_get_size;
+  surf_workstation_model->extension.workstation.get_info = ws_file_get_info;
+  surf_workstation_model->extension.workstation.get_free_size = ws_storage_get_free_size;
+  surf_workstation_model->extension.workstation.get_used_size = ws_storage_get_used_size;
+  surf_workstation_model->extension.workstation.get_storage_list = ws_get_storage_list;
 }
 
 void surf_workstation_model_init_current_default(void)
 {
   surf_workstation_model_init_internal();
-  xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", xbt_strdup("yes"));
+  xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();