/* 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);
- msg_host_t remote_host = MSG_get_host_by_name(storage_priv_src->host);
- read_size = simcall_file_read(file_priv->simdata->smx_file, size, remote_host);
+ msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
+ read_size = simcall_file_read(file_priv->simdata->smx_file, size, attached_host);
- if(strcmp(storage_priv_src->host, MSG_host_get_name(MSG_host_self()))){
+ if(strcmp(storage_priv_src->hostname, MSG_host_get_name(MSG_host_self()))){
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
- XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->host, read_size);
+ XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->hostname, read_size);
msg_host_t *m_host_list = NULL;
m_host_list = calloc(2, sizeof(msg_host_t));
m_host_list[0] = MSG_host_self();
- m_host_list[1] = remote_host;
+ m_host_list[1] = attached_host;
double computation_amount[] = { 0, 0 };
- double communication_amount[] = { 0, (double)read_size, 0, 0 };
+ double communication_amount[] = { 0, 0, (double)read_size, 0 };
msg_task_t task = MSG_parallel_task_create("file transfer for read", 2, m_host_list, computation_amount, communication_amount, NULL);
msg_error_t transfer = MSG_parallel_task_execute(task);
free(m_host_list);
if(transfer != MSG_OK){
if (transfer == MSG_HOST_FAILURE)
- XBT_WARN("Transfer error, remote host just turned off!");
+ XBT_WARN("Transfer error, %s remote host just turned off!", MSG_host_get_name(attached_host));
if (transfer == MSG_TASK_CANCELED)
XBT_WARN("Transfer error, task has been canceled!");
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);
msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
- msg_host_t remote_host = MSG_get_host_by_name(storage_priv_src->host);
+ msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
- if(strcmp(storage_priv_src->host, MSG_host_get_name(MSG_host_self()))){
+ if(strcmp(storage_priv_src->hostname, MSG_host_get_name(MSG_host_self()))){
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
- XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->host, size);
+ XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->hostname, size);
msg_host_t *m_host_list = NULL;
m_host_list = calloc(2, sizeof(msg_host_t));
m_host_list[0] = MSG_host_self();
- m_host_list[1] = remote_host;
+ m_host_list[1] = attached_host;
double computation_amount[] = { 0, 0 };
- double communication_amount[] = { 0, 0, 0, (double)size };
+ double communication_amount[] = { 0, (double)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);
free(m_host_list);
if(transfer != MSG_OK){
if (transfer == MSG_HOST_FAILURE)
- XBT_WARN("Transfer error, remote host just turned off!");
+ XBT_WARN("Transfer error, %s remote host just turned off!", MSG_host_get_name(attached_host));
if (transfer == MSG_TASK_CANCELED)
XBT_WARN("Transfer error, task has been canceled!");
}
}
/* Write file on local or remote host */
- write_size = simcall_file_write(file_priv->simdata->smx_file, size, 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;
}
*/
msg_file_t MSG_file_open(const char* fullpath, void* data)
{
+ char *name;
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());
+ name = bprintf("%s:%i:%s",MSG_host_get_name(MSG_host_self()),MSG_process_self_PID(),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);
-
+ xbt_free(name);
return fd;
}
-/**
- * \brief Frees private data of a file (internal call only)
- */
-void __MSG_file_priv_free(msg_file_priv_t priv)
-{
- xbt_free(&priv->simdata->smx_file);
- free(priv);
-}
-
/** \ingroup msg_file_management
* \brief Close the file
*
*/
int MSG_file_close(msg_file_t fd)
{
+ char *name;
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());
+ name = bprintf("%s:%i:%s",MSG_host_get_name(MSG_host_self()),MSG_process_self_PID(),priv->fullpath);
+ xbt_lib_unset(file_lib, name, MSG_FILE_LEVEL, 1);
+ xbt_free(name);
return res;
}
* \param fd is the file descriptor (#msg_file_t)
* \return 0 on success or 1 on error
*/
-int MSG_file_unlink(msg_file_t fd)
+msg_error_t MSG_file_unlink(msg_file_t fd)
{
- msg_file_priv_t priv = MSG_file_priv(fd);
- int res = simcall_file_unlink(priv->simdata->smx_file);
+ msg_file_priv_t file_priv = MSG_file_priv(fd);
+ /* 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);
+ msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
+ msg_host_t attached_host = MSG_get_host_by_name(storage_priv_src->hostname);
+ int res = simcall_file_unlink(file_priv->simdata->smx_file, attached_host);
return res;
}
return simcall_file_get_size(priv->simdata->smx_file);
}
-/** \ingroup msg_file_management
- * \brief Search for file
- *
- * \param mount is the mount point where find the file is located
- * \param path the file regex to find
- * \return a xbt_dict_t of file where key is the name of file and the
- * value the msg_stat_t corresponding to the key
- */
-xbt_dict_t MSG_file_ls(const char *mount, const char *path)
-{
- xbt_assert(path,"You must set path");
- int size = strlen(path);
- if(size && path[size-1] != '/')
- {
- char *new_path = bprintf("%s/",path);
- XBT_DEBUG("Change '%s' for '%s'",path,new_path);
- xbt_dict_t dict = simcall_file_ls(mount, new_path);
- xbt_free(new_path);
- return dict;
- }
-
- return simcall_file_ls(mount, path);
-}
-
/**
* \ingroup msg_file_management
* \brief Set the file position indicator in the msg_file_t by adding offset bytes
* 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);
/**
* \ingroup msg_file_management
* \brief Copy a file to another location on a remote host.
- * \param fd : the file to move
+ * \param file : the file to move
* \param host : the remote host where the file has to be copied
* \param fullpath : the complete path destination on the remote host
* \return If successful, the function returns MSG_OK. Otherwise, it returns
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->host;
+ 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);
}
free(file_mount_name);
}
+ xbt_dict_free(&storage_list);
+
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->host;
+ 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;
}
/**
* \ingroup msg_file_management
* \brief Move a file to another location on a remote host.
- * \param fd : the file to move
+ * \param file : the file to move
* \param host : the remote host where the file has to be moved
* \param fullpath : the complete path destination on the remote host
* \return If successful, the function returns MSG_OK. Otherwise, it returns
*/
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;
}
const char *name = SIMIX_storage_get_name(storage);
const char *host = SIMIX_storage_get_host(storage);
msg_storage_priv_t storage_private = xbt_new0(s_msg_storage_priv_t, 1);
- storage_private->host = host;
+ storage_private->hostname = host;
xbt_lib_set(storage_lib,name,MSG_STORAGE_LEVEL,storage_private);
return xbt_lib_get_elm_or_null(storage_lib, name);
}
/** \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
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);
const char *MSG_storage_get_host(msg_storage_t storage) {
xbt_assert((storage != NULL), "Invalid parameters");
msg_storage_priv_t priv = MSG_storage_priv(storage);
- return priv->host;
+ return priv->hostname;
}
