X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e74a8baa9c785f592bf0694e43cc3fba79e3f17..a02888b15739104c0def9ee3c782e314949876d9:/src/msg/msg_io.c

diff --git a/src/msg/msg_io.c b/src/msg/msg_io.c
index 86c58c99cb..898604db09 100644
--- a/src/msg/msg_io.c
+++ b/src/msg/msg_io.c
@@ -140,7 +140,7 @@ sg_size_t MSG_file_read(msg_file_t fd, sg_size_t size)
 sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
 {
   msg_file_priv_t file_priv = MSG_file_priv(fd);
-  sg_size_t write_size;
+  sg_size_t write_size, offset;
 
   /* Find the host where the file is physically located (remote or local)*/
   msg_storage_t storage_src =(msg_storage_t) xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId);
@@ -172,7 +172,9 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
     }
   }
   /* Write file on local or remote host */
+  offset = simcall_file_tell(file_priv->simdata->smx_file);
   write_size = simcall_file_write(file_priv->simdata->smx_file, size, attached_host);
+  file_priv->size = offset+write_size;
 
   return write_size;
 }
@@ -187,13 +189,15 @@ sg_size_t MSG_file_write(msg_file_t fd, sg_size_t size)
  */
 msg_file_t MSG_file_open(const char* fullpath, void* data)
 {
+  char name[2048];
   msg_file_priv_t priv = xbt_new(s_msg_file_priv_t, 1);
   priv->data = data;
   priv->fullpath = xbt_strdup(fullpath);
   priv->simdata = xbt_new0(s_simdata_file_t,1);
-  priv->simdata->smx_file = simcall_file_open(fullpath);
-  xbt_lib_set(file_lib, fullpath, MSG_FILE_LEVEL, priv);
-  msg_file_t fd = (msg_file_t) xbt_lib_get_elm_or_null(file_lib, fullpath);
+  priv->simdata->smx_file = simcall_file_open(fullpath, MSG_host_self());
+  sprintf(name, "%s:%s",MSG_host_get_name(MSG_host_self()),fullpath);
+  xbt_lib_set(file_lib, name, MSG_FILE_LEVEL, priv);
+  msg_file_t fd = (msg_file_t) xbt_lib_get_elm_or_null(file_lib, name);
   __MSG_file_get_info(fd);
 
   return fd;
@@ -216,9 +220,11 @@ void __MSG_file_priv_free(msg_file_priv_t priv)
  */
 int MSG_file_close(msg_file_t fd)
 {
+  char name[2048];
   msg_file_priv_t priv = MSG_file_priv(fd);
-  int res = simcall_file_close(priv->simdata->smx_file);
-  xbt_lib_unset(file_lib, priv->fullpath, MSG_FILE_LEVEL, 1);
+  int res = simcall_file_close(priv->simdata->smx_file, MSG_host_self());
+  sprintf(name, "%s:%s",MSG_host_get_name(MSG_host_self()),priv->fullpath);
+  xbt_lib_unset(file_lib, name, MSG_FILE_LEVEL, 1);
   return res;
 }
 
@@ -262,7 +268,7 @@ sg_size_t MSG_file_get_size(msg_file_t fd){
  * MSG_TASK_CANCELED (=8).
  *
  */
-msg_error_t MSG_file_seek(msg_file_t fd, sg_size_t offset, int origin)
+msg_error_t MSG_file_seek(msg_file_t fd, sg_offset_t offset, int origin)
 {
   msg_file_priv_t priv = MSG_file_priv(fd);
   return simcall_file_seek(priv->simdata->smx_file, offset, origin);
@@ -311,18 +317,20 @@ msg_error_t MSG_file_move (msg_file_t fd, const char* fullpath)
 msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpath)
 {
   msg_file_priv_t file_priv = MSG_file_priv(file);
+  sg_size_t read_size;
 
-  /* Find the host source where the file is physically located */
+  /* Find the host where the file is physically located and read it */
   msg_storage_t storage_src =(msg_storage_t) xbt_lib_get_elm_or_null(storage_lib, file_priv->storageId);
-
   msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
-  const char *host_name_src, *host_name_dest;
-  host_name_src = storage_priv_src->hostname;
+  msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
+  MSG_file_seek(file, 0, SEEK_SET);
+  read_size = simcall_file_read(file_priv->simdata->smx_file, file_priv->size, attached_host);
 
   /* Find the real host destination where the file will be physically stored */
   xbt_dict_cursor_t cursor = NULL;
-  char *mount_name, *storage_name, *file_mount_name;
-  msg_storage_t storage_dest;
+  char *mount_name, *storage_name, *file_mount_name, *host_name_dest;
+  msg_storage_t storage_dest = NULL;
+  msg_host_t host_dest;
   size_t longest_prefix_length = 0;
 
   xbt_dict_t storage_list = simcall_host_get_mounted_storage_list(host);
@@ -341,42 +349,42 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa
   if(longest_prefix_length>0){
     /* Mount point found, retrieve the host the storage is attached to */
     msg_storage_priv_t storage_dest_priv = MSG_storage_priv(storage_dest);
-    host_name_dest = storage_dest_priv->hostname;
+    host_name_dest = (char*)storage_dest_priv->hostname;
+    host_dest = MSG_get_host_by_name(host_name_dest);
 
   }else{
     XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, SIMIX_host_get_name(host));
     return MSG_TASK_CANCELED;
   }
-  XBT_INFO("HOST SRC %s HOST DEST %s", host_name_src, host_name_dest);
 
-  /* Try to send file calling SIMIX network layer */
+  XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, storage_priv_src->hostname, host_name_dest);
+  msg_host_t *m_host_list = NULL;
+  m_host_list = calloc(2, sizeof(msg_host_t));
+
+  m_host_list[0] = attached_host;
+  m_host_list[1] = host_dest;
+  double computation_amount[] = { 0, 0 };
+  double communication_amount[] = { 0, (double)read_size, 0, 0 };
+
+  msg_task_t task = MSG_parallel_task_create("file transfer for write", 2, m_host_list, computation_amount, communication_amount, NULL);
+  msg_error_t transfer = MSG_parallel_task_execute(task);
+  MSG_task_destroy(task);
+  free(m_host_list);
+  if(transfer != MSG_OK){
+    if (transfer == MSG_HOST_FAILURE)
+      XBT_WARN("Transfer error, %s remote host just turned off!", host_name_dest);
+    if (transfer == MSG_TASK_CANCELED)
+      XBT_WARN("Transfer error, task has been canceled!");
+
+    return -1;
+  }
 
-  size_t file_size = simcall_file_read(file_priv->simdata->smx_file, file_priv->size, MSG_get_host_by_name(host_name_src));
-  xbt_ex_t e;
-  msg_error_t ret = MSG_OK;
+  /* Create file on remote host, write it and close it */
+  smx_file_t smx_file = simcall_file_open(fullpath, host_dest);
+  simcall_file_write(smx_file, read_size, host_dest);
+  simcall_file_close(smx_file, host_dest);
+  return MSG_OK;
 
-  TRY {
-    msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(host_name_dest);
-    simcall_comm_isend(mailbox, (double) file_size, -1.0, file, sizeof(void *), NULL, NULL, (void*)file, 0);
-    simcall_comm_irecv(mailbox, file, NULL, NULL, NULL, -1.0);
-  }
-  CATCH(e) {
-    switch (e.category) {
-    case cancel_error:
-      ret = MSG_HOST_FAILURE;
-      break;
-    case network_error:
-      ret = MSG_TRANSFER_FAILURE;
-      break;
-    case timeout_error:
-      ret = MSG_TIMEOUT;
-      break;
-    default:
-      RETHROW;
-    }
-    xbt_ex_free(e);
-  }
-  return ret;
 }
 
 /**
@@ -390,9 +398,8 @@ msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpa
  */
 msg_error_t MSG_file_rmove (msg_file_t file, msg_host_t host, const char* fullpath)
 {
-  msg_file_priv_t file_priv = MSG_file_priv(file);
-  msg_error_t res = simcall_file_rcopy(file_priv->simdata->smx_file, host, fullpath);
-  simcall_file_unlink(file_priv->simdata->smx_file);
+  msg_error_t res = MSG_file_rcopy(file, host, fullpath);
+  MSG_file_unlink(file);
   return res;
 }
 
@@ -443,20 +450,20 @@ const char *MSG_storage_get_name(msg_storage_t storage) {
 
 /** \ingroup msg_storage_management
  * \brief Returns the free space size of a storage element
- * \param name the name of a storage
+ * \param storage a storage
  * \return the free space size of the storage element (as a #sg_size_t)
  */
-sg_size_t MSG_storage_get_free_size(const char* name){
-  return simcall_storage_get_free_size(name);
+sg_size_t MSG_storage_get_free_size(msg_storage_t storage){
+  return simcall_storage_get_free_size(storage);
 }
 
 /** \ingroup msg_storage_management
  * \brief Returns the used space size of a storage element
- * \param name the name of a storage
+ * \param storage a storage
  * \return the used space size of the storage element (as a #sg_size_t)
  */
-sg_size_t MSG_storage_get_used_size(const char* name){
-  return simcall_storage_get_used_size(name);
+sg_size_t MSG_storage_get_used_size(msg_storage_t storage){
+  return simcall_storage_get_used_size(storage);
 }
 
 /** \ingroup msg_storage_management
@@ -550,6 +557,12 @@ xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
   return SIMIX_storage_get_content(storage);
 }
 
+/** \ingroup msg_storage_management
+ *
+ * \brief Returns the size of a #msg_storage_t.
+ * \param storage a storage
+ * \return The size of the storage
+ */
 sg_size_t MSG_storage_get_size(msg_storage_t storage)
 {
   return SIMIX_storage_get_size(storage);