return storage_list;
}
-xbt_dict_t Workstation::getAttachedStorageList()
+xbt_dynar_t Workstation::getAttachedStorageList()
{
xbt_lib_cursor_t cursor;
char *key;
void **data;
- xbt_dict_t res = xbt_dict_new_homogeneous(NULL);
+ xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL);
xbt_lib_foreach(storage_lib, cursor, key, data) {
- if(routing_get_network_element_type(key) == SURF_STORAGE_LEVEL) {
- xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
- if ( (static_cast<StoragePtr>(surf_storage_resource_priv(surf_storage_resource_by_name((const char*)elm))))->p_attach == this->getName())
- xbt_dict_set(res,(const char*)elm,xbt_lib_get_level(elm,MSG_STORAGE_LEVEL),NULL);
- }
+ 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 res;
-
+ return result;
}
+ActionPtr Workstation::open(const char* fullpath) {
-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);
+ StoragePtr st = NULL;
+ s_mount_t mnt;
+ unsigned int cursor;
+ size_t longest_prefix_length = 0;
+ char *path = NULL;
+ char *file_mount_name = NULL;
+ char *mount_name = NULL;
+
+ 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);
+ file_mount_name = (char *) xbt_malloc ((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)>longest_prefix_length)
+ {/* The current mount name is found in the full path and is bigger than the previous*/
+ longest_prefix_length = strlen(mnt.name);
+ st = static_cast<StoragePtr>(mnt.storage);
+ }
+ free(file_mount_name);
+ }
+ if(longest_prefix_length>0)
+ { /* Mount point found, split fullpath into mount_name and path+filename*/
+ path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1));
+ mount_name = (char *) xbt_malloc ((longest_prefix_length+1));
+ strncpy(mount_name, fullpath, longest_prefix_length);
+ path[strlen(fullpath)-longest_prefix_length] = '\0';
+ mount_name[longest_prefix_length] = '\0';
+ }
+ 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) {
