X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a0459051e2eea639a475b8267472daee1769693..73662a7c0b0d1e462f2b99322183295be3a24a5a:/src/surf/workstation_interface.cpp

diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp
index 1b41b0cf1a..06a52f62aa 100644
--- a/src/surf/workstation_interface.cpp
+++ b/src/surf/workstation_interface.cpp
@@ -170,7 +170,7 @@ StoragePtr Workstation::findStorageOnMountList(const char* mount)
   return st;
 }
 
-xbt_dict_t Workstation::getStorageList()
+xbt_dict_t Workstation::getMountedStorageList()
 {
   s_mount_t mnt;
   unsigned int i;
@@ -184,10 +184,58 @@ xbt_dict_t Workstation::getStorageList()
   return storage_list;
 }
 
-ActionPtr Workstation::open(const char* mount, const char* path) {
-  StoragePtr st = findStorageOnMountList(mount);
-  XBT_DEBUG("OPEN on disk '%s'", st->getName());
-  return st->open(mount, path);
+xbt_dynar_t Workstation::getAttachedStorageList()
+{
+  xbt_lib_cursor_t cursor;
+  char *key;
+  void **data;
+  xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL);
+  xbt_lib_foreach(storage_lib, cursor, key, data) {
+	  if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) {
+	    StoragePtr storage = static_cast<StoragePtr>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
+	    if(!strcmp((const char*)storage->p_attach,this->getName())){
+	      xbt_dynar_push_as(result, void *,(void *)static_cast<ResourcePtr>(storage)->getName());
+	    }
+	  }
+  }
+  return result;
+}
+
+ActionPtr Workstation::open(const char* fullpath) {
+
+  StoragePtr st = NULL;
+  s_mount_t mnt;
+  unsigned int cursor;
+  size_t pos = 0;
+  char *path, *mount_name;
+
+  XBT_DEBUG("Search for storage name for '%s' on '%s'", fullpath, getName());
+  xbt_dynar_foreach(p_storage,cursor,mnt)
+  {
+    XBT_DEBUG("See '%s'",mnt.name);
+    char *file_mount_name = NULL;
+    file_mount_name = xbt_new(char,strlen(mnt.name)+1);
+    strncpy(file_mount_name,fullpath,strlen(mnt.name));
+    file_mount_name[strlen(mnt.name)] = '\0';
+
+    if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>pos)
+    {/* The current mount name is found in the full path and is bigger than the previous*/
+    	pos = strlen(mnt.name);
+    	mount_name = mnt.name;
+    	st = static_cast<StoragePtr>(mnt.storage);
+    }
+    xbt_free(file_mount_name);
+  }
+  if(pos>0)
+  { /* Mount point found, deduce path + file name from full path (full path = mount name + path + file name)*/
+	path = xbt_new(char, strlen(fullpath)-strlen(mount_name));
+	strncpy(path, fullpath+pos, strlen(fullpath)-strlen(mount_name)+1);
+	XBT_INFO("TROUVE");
+  }
+  else
+    xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName());
+
+  return st->open(mount_name, path);
 }
 
 ActionPtr Workstation::close(surf_file_t fd) {