A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Removes MSG_storage_file_rename()
[simgrid.git]
/
src
/
surf
/
workstation_interface.cpp
diff --git
a/src/surf/workstation_interface.cpp
b/src/surf/workstation_interface.cpp
index
09f8af3
..
60480b9
100644
(file)
--- a/
src/surf/workstation_interface.cpp
+++ b/
src/surf/workstation_interface.cpp
@@
-216,7
+216,7
@@
ActionPtr Workstation::open(const char* fullpath) {
{
XBT_DEBUG("See '%s'",mnt.name);
file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1));
- strncpy(file_mount_name,fullpath,strlen(mnt.name));
+ strncpy(file_mount_name,fullpath,strlen(mnt.name)
+1
);
file_mount_name[strlen(mnt.name)] = '\0';
if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>longest_prefix_length)
@@
-230,14
+230,18
@@
ActionPtr Workstation::open(const char* fullpath) {
{ /* 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);
+ strncpy(mount_name, fullpath, longest_prefix_length+1);
+ strncpy(path, fullpath+longest_prefix_length, strlen(fullpath)-longest_prefix_length+1);
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 action = st->open((const char*)mount_name, (const char*)path);
+ free((char*)path);
+ free((char*)mount_name);
+ return action;
}
ActionPtr Workstation::close(surf_file_t fd) {
@@
-333,6
+337,37
@@
int Workstation::fileSeek(surf_file_t fd, sg_size_t offset, int origin){
}
}
+int Workstation::fileMove(surf_file_t fd, const char* fullpath){
+
+ /* Check if the new full path is on the same mount point */
+ if(!strncmp((const char*)fd->mount, fullpath, strlen(fd->mount)))
+ {
+ sg_size_t *psize, *new_psize;
+ psize = (sg_size_t*) xbt_dict_get_or_null(findStorageOnMountList(fd->mount)->p_content,fd->name);
+ new_psize = xbt_new(sg_size_t, 1);
+ *new_psize = *psize;
+ if (psize){// src file exists
+ xbt_dict_remove(findStorageOnMountList(fd->mount)->p_content, fd->name);
+
+ char *path = (char *) xbt_malloc ((strlen(fullpath)-strlen(fd->mount)+1));;
+ strncpy(path, fullpath+strlen(fd->mount), strlen(fullpath)-strlen(fd->mount)+1);
+ xbt_dict_set(findStorageOnMountList(fd->mount)->p_content, path, new_psize,NULL);
+ XBT_DEBUG("Move file from %s to %s, size '%llu'",fd->name, fullpath, *psize);
+ free(path);
+ return MSG_OK;
+ }
+ else
+ XBT_WARN("File %s doesn't exist", fd->name);
+ return MSG_TASK_CANCELED;
+ }
+ else
+ {
+ XBT_WARN("New full path %s is not on the same mount point: %s. Action has been canceled.", fullpath, fd->mount);
+ return MSG_TASK_CANCELED;
+ }
+}
+
+
sg_size_t Workstation::getFreeSize(const char* name)
{
StoragePtr st = findStorageOnMountList(name);