X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2df13795e01302813a6aef10825ec7e922ce530..fa45ee4a5c6eb99a3d7bb445875d8035e492bdc7:/src/surf/workstation_interface.cpp

diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp
index 09f8af3b69..9783d2a69a 100644
--- 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) {
@@ -263,7 +267,7 @@ int Workstation::unlink(surf_file_t fd) {
     XBT_WARN("No such file descriptor. Impossible to unlink");
     return 0;
   } else {
-//    XBT_INFO("%s %zu", fd->storage, fd->size);
+
     StoragePtr st = findStorageOnMountList(fd->mount);
     /* Check if the file is on this storage */
     if (!xbt_dict_get_or_null(st->p_content, fd->name)){
@@ -333,6 +337,102 @@ 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;
+  }
+}
+
+int Workstation::fileRcopy(surf_file_t fd, surf_resource_t host_dest, const char* fullpath){
+
+  XBT_INFO("FILE %s WKS %s FULLPATH %s",fd->name, host_dest->key, fullpath);
+
+  /* Find the host src where the file is located */
+  StoragePtr storage = findStorageOnMountList(fd->mount);
+  const char* host_name_src = (const char*)storage->p_attach;
+
+  /* Find the host dest where the file will be stored */
+  s_mount_t mnt;
+  unsigned int cursor;
+  StoragePtr storage_dest = NULL;
+  const char* host_name_dest;
+  char *file_mount_name = NULL;
+  size_t longest_prefix_length = 0;
+  xbt_dynar_foreach(((WorkstationPtr)host_dest)->p_storage,cursor,mnt)
+  {
+    file_mount_name = (char *) xbt_malloc ((strlen(mnt.name)+1));
+    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)
+	{/* The current mount name is found in the full path and is bigger than the previous*/
+      longest_prefix_length = strlen(mnt.name);
+      storage_dest = static_cast<StoragePtr>(mnt.storage);
+	}
+	free(file_mount_name);
+  }
+  if(longest_prefix_length>0)
+  { /* Mount point found */
+    host_name_dest = storage_dest->p_attach;
+  }
+  else
+  {
+    XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host_dest->key);
+    return MSG_TASK_CANCELED;
+  }
+  XBT_INFO("SRC %s DEST %s", host_name_src, host_name_dest);
+  return MSG_OK;
+
+
+//  /* Check that file to copy is local to the src workstation (storage is attached to src workstation) */
+//  StoragePtr storage = findStorageOnMountList(fd->mount);
+//  if(!strcmp((const char*)storage->p_attach, this->getName()))
+//  {
+//    /* Check that there is a route between src and dest workstations */
+//    xbt_dynar_t route = NULL;
+//    routing_get_route_and_latency(this->p_netElm, ((WorkstationPtr)host_dest)->p_netElm, &route, NULL);
+//    if(route){
+//
+//      ATTENTION DISCUSSION AVEC FRED !
+//      return MSG_OK;
+//    }
+//    else
+//    {
+//      XBT_WARN("There is no route between %s and %s. Action has been canceled", this->getName(), host_dest->key);
+//      return MSG_TASK_CANCELED;
+//    }
+//  }
+//  else
+//  {
+//    XBT_WARN("File %s is not local to %s but to %s. Action has been canceled", fd->name,this->getName(), storage->p_attach);
+//    return MSG_TASK_CANCELED;
+//  }
+}
+
 sg_size_t Workstation::getFreeSize(const char* name)
 {
   StoragePtr st = findStorageOnMountList(name);