X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45e0cfcbe06707d42a1da9d2a5f4a72ba4140c8b..96cedde3cdbc0b8ffc3f096a1b65d021b0226f99:/src/plugins/file_system/s4u_FileSystem.cpp diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp index 744ae26352..6f3d43a6ac 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -105,20 +105,20 @@ sg_size_t File::read(sg_size_t size) if (strcmp(host->get_cname(), Host::current()->get_cname())) { /* 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.", host->get_cname(), read_size); - Host* m_host_list[] = {Host::current(), host}; - double* flops_amount = new double[2]{0, 0}; - double* bytes_amount = new double[4]{0, 0, static_cast(read_size), 0}; + std::vector m_host_list = {Host::current(), host}; + std::vector flops_amount = {0., 0.}; + std::vector bytes_amount = {0., 0., static_cast(read_size), 0.}; - this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount); + this_actor::parallel_execute(m_host_list, flops_amount, bytes_amount); } return read_size; } -/** \brief Write into a file (local or remote) +/** @brief Write into a file (local or remote) * - * \param size of the file to write - * \return the number of bytes successfully write or -1 if an error occurred + * @param size of the file to write + * @return the number of bytes successfully write or -1 if an error occurred */ sg_size_t File::write(sg_size_t size) { @@ -131,11 +131,11 @@ sg_size_t File::write(sg_size_t size) if (strcmp(host->get_cname(), Host::current()->get_cname())) { /* 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.", host->get_cname(), size); - Host* m_host_list[] = {Host::current(), host}; - double* flops_amount = new double[2]{0, 0}; - double* bytes_amount = new double[4]{0, static_cast(size), 0, 0}; + std::vector m_host_list = {Host::current(), host}; + std::vector flops_amount = {0, 0}; + std::vector bytes_amount = {0, static_cast(size), 0, 0}; - this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount); + this_actor::parallel_execute(m_host_list, flops_amount, bytes_amount); } XBT_DEBUG("WRITE %s on disk '%s'. size '%llu/%llu'", get_path(), local_storage_->get_cname(), size, size_); @@ -264,11 +264,11 @@ int File::remote_copy(sg_host_t host, const char* fullpath) XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, src_host->get_cname(), storage_dest->get_host()->get_cname()); - Host* m_host_list[] = {src_host, dst_host}; - double* flops_amount = new double[2]{0, 0}; - double* bytes_amount = new double[4]{0, static_cast(read_size), 0, 0}; + std::vector m_host_list = {src_host, dst_host}; + std::vector flops_amount = {0, 0}; + std::vector bytes_amount = {0, static_cast(read_size), 0, 0}; - this_actor::parallel_execute(2, m_host_list, flops_amount, bytes_amount); + this_actor::parallel_execute(m_host_list, flops_amount, bytes_amount); /* Create file on remote host, write it and close it */ File* fd = new File(fullpath, dst_host, nullptr); @@ -404,12 +404,12 @@ void sg_file_set_data(sg_file_t fd, void* data) } /** - * \brief Set the file position indicator in the sg_file_t by adding offset bytes + * @brief Set the file position indicator in the sg_file_t by adding offset bytes * to the position specified by origin (either SEEK_SET, SEEK_CUR, or SEEK_END). * - * \param fd : file object that identifies the stream - * \param offset : number of bytes to offset from origin - * \param origin : Position used as reference for the offset. It is specified by one of the following constants defined + * @param fd : file object that identifies the stream + * @param offset : number of bytes to offset from origin + * @param origin : Position used as reference for the offset. It is specified by one of the following constants defined * in \ exclusively to be used as arguments for this function (SEEK_SET = beginning of file, * SEEK_CUR = current position of the file pointer, SEEK_END = end of file) */ @@ -435,11 +435,11 @@ void sg_file_unlink(sg_file_t fd) } /** - * \brief Copy a file to another location on a remote host. - * \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 0. Otherwise, it returns -1. + * @brief Copy a file to another location on a remote host. + * @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 0. Otherwise, it returns -1. */ int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath) { @@ -447,11 +447,11 @@ int sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath) } /** - * \brief Move a file to another location on a remote host. - * \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 0. Otherwise, it returns -1. + * @brief Move a file to another location on a remote host. + * @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 0. Otherwise, it returns -1. */ int sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath) {