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

diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp
index 8ff047a8d5..b04b7195d8 100644
--- a/src/surf/workstation_interface.cpp
+++ b/src/surf/workstation_interface.cpp
@@ -9,6 +9,8 @@
 #include "cpu_cas01.hpp"
 #include "simgrid/sg_config.h"
 
+#include "network_interface.hpp"
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                 "Logging specific to the SURF workstation module");
 
@@ -191,12 +193,12 @@ xbt_dynar_t Workstation::getAttachedStorageList()
   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());
-	    }
+    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;
 }
@@ -206,37 +208,42 @@ ActionPtr Workstation::open(const char* fullpath) {
   StoragePtr st = NULL;
   s_mount_t mnt;
   unsigned int cursor;
-  size_t pos = 0;
-  char *path, *mount_name, *file_mount_name;
-
+  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) * sizeof (char));
-    strncpy(file_mount_name,fullpath,strlen(mnt.name));
+    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)>pos)
+    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*/
-      pos = strlen(mnt.name);
-      mount_name = mnt.name;
+      longest_prefix_length = strlen(mnt.name);
       st = static_cast<StoragePtr>(mnt.storage);
     }
+    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 = (char *) xbt_malloc ((strlen(fullpath)-strlen(mount_name)+1) * sizeof (char));
-	strncpy(path, fullpath+pos, strlen(fullpath)-strlen(mount_name));
-	path[strlen(fullpath)-strlen(mount_name)] = '\0';
+  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+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());
 
-  free(file_mount_name);
-  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) {
@@ -262,7 +269,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)){
@@ -332,6 +339,129 @@ 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_DEBUG("Rcopy file %s on %s to %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 real 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;
+  size_t longest_prefix_length = 0;
+  WorkstationPtr dest_ws, src_ws;
+
+  dest_ws = static_cast<WorkstationPtr>(surf_workstation_resource_priv(host_dest));
+
+  xbt_dynar_foreach(dest_ws->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, retrieve the host the storage is attached to */
+    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;
+  }
+
+  /* Check that there is a route between src and dest workstations */
+  xbt_dynar_t route = NULL;
+  dest_ws = static_cast<WorkstationPtr>(surf_workstation_resource_priv(xbt_lib_get_elm_or_null(host_lib, host_name_dest)));
+  src_ws = static_cast<WorkstationPtr>(surf_workstation_resource_priv(xbt_lib_get_elm_or_null(host_lib, host_name_src)));
+
+  routing_get_route_and_latency(src_ws->p_netElm, dest_ws->p_netElm, &route, NULL);
+  if(!xbt_dynar_length (route))
+  {
+	XBT_WARN("There is no route between %s and %s. Action has been canceled", src_ws->getName(), dest_ws->getName());
+	return MSG_TASK_CANCELED;
+  }
+  else
+  {/* There is a route between src and dest, let's copy the file */
+
+    /* Read the file on the src side */
+	src_ws->read(fd, fd->size);
+
+	/* Send a message from src to dest to simulate data transfer */
+	surf_network_model->communicate(src_ws->p_netElm, dest_ws->p_netElm, fd->size, .0);
+
+	/* Create the file on the dest side and write data into it*/
+	char *mount_name, *path;
+	path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1));
+	mount_name = (char *) xbt_malloc ((longest_prefix_length+1));
+
+	/* deduce mount_name and path from fullpath */
+	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';
+
+    /* create the file */
+	StorageActionPtr open_action = storage_dest->open((const char*)mount_name, (const char*)path);
+
+	surf_file_t surf_file = xbt_new(s_surf_file_t, 1);
+	surf_file->current_position = 0;
+	surf_file->mount = mount_name;
+	surf_file->name = strdup(path);
+	surf_file->size = 0;
+
+	/* write data and close file*/
+	storage_dest->write(surf_file, fd->size);
+	storage_dest->close(open_action->p_file);
+
+	free(path);
+    free(mount_name);
+    XBT_DEBUG("File %s has been copied on %s to %s",fd->name, host_dest->key, fullpath);
+    return MSG_OK;
+  }
+}
+
 sg_size_t Workstation::getFreeSize(const char* name)
 {
   StoragePtr st = findStorageOnMountList(name);