Prefer std::string for C++ API.

[simgrid.git] / 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 6c37927..46b3e48 100644 (file)
--- a/src/plugins/file_system/s4u_FileSystem.cpp
+++ b/src/plugins/file_system/s4u_FileSystem.cpp
@@ -16,6 +16,7 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <fstream>
+#include <memory>
 #include <numeric>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_file, s4u, "S4U files");
@@ -105,9 +106,9 @@ File::File(const std::string& fullpath, sg_host_t host, void* userdata) : fullpa
     }
 
     // assign a file descriptor id to the newly opened File
-    FileDescriptorHostExt* ext = host->extension<simgrid::s4u::FileDescriptorHostExt>();
+    auto* ext = host->extension<simgrid::s4u::FileDescriptorHostExt>();
     if (ext->file_descriptor_table == nullptr) {
-      ext->file_descriptor_table.reset(new std::vector<int>(sg_storage_max_file_descriptors));
+      ext->file_descriptor_table = std::make_unique<std::vector<int>>(sg_storage_max_file_descriptors);
       std::iota(ext->file_descriptor_table->rbegin(), ext->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0.
     }
     xbt_assert(not ext->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed.");
@@ -388,7 +389,7 @@ int File::unlink() const
   }
 }
 
-int File::remote_copy(sg_host_t host, const char* fullpath)
+int File::remote_copy(sg_host_t host, const std::string& fullpath)
 {
   /* Find the host where the file is physically located and read it */
   Host* src_host = nullptr;
@@ -431,7 +432,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath)
       /* Mount point found, retrieve the host the storage is attached to */
       dst_host = storage_dest->get_host();
     } else {
-      XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname());
+      XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname());
       return -1;
     }
   }
@@ -450,7 +451,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath)
     }
 
     if (dst_disk == nullptr) {
-      XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->get_cname());
+      XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath.c_str(), host->get_cname());
       return -1;
     }
   }
@@ -462,7 +463,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath)
   }
 
   /* Create file on remote host, write it and close it */
-  File* fd = new File(fullpath, dst_host, nullptr);
+  auto* fd = new File(fullpath, dst_host, nullptr);
   if (local_storage_) {
     sg_size_t write_size = fd->local_storage_->write(read_size);
     fd->local_storage_->extension<FileSystemStorageExt>()->incr_used_size(write_size);
@@ -474,7 +475,7 @@ int File::remote_copy(sg_host_t host, const char* fullpath)
   return 0;
 }
 
-int File::remote_move(sg_host_t host, const char* fullpath)
+int File::remote_move(sg_host_t host, const std::string& fullpath)
 {
   int res = remote_copy(host, fullpath);
   unlink();
@@ -509,7 +510,7 @@ std::map<std::string, sg_size_t>* FileSystemDiskExt::parse_content(const std::st
   if (filename.empty())
     return nullptr;
 
-  std::map<std::string, sg_size_t>* parse_content = new std::map<std::string, sg_size_t>();
+  auto* parse_content = new std::map<std::string, sg_size_t>();
 
   std::ifstream* fs = surf_ifsopen(filename);
   xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(),
@@ -538,7 +539,7 @@ std::map<std::string, sg_size_t>* FileSystemStorageExt::parse_content(const std:
   if (filename.empty())
     return nullptr;
 
-  std::map<std::string, sg_size_t>* parse_content = new std::map<std::string, sg_size_t>();
+  auto* parse_content = new std::map<std::string, sg_size_t>();
 
   std::ifstream* fs = surf_ifsopen(filename);
   xbt_assert(not fs->fail(), "Cannot open file '%s' (path=%s)", filename.c_str(),
@@ -716,7 +717,7 @@ sg_size_t sg_file_get_size(const_sg_file_t fd)
   return fd->size();
 }
 
-void sg_file_dump(sg_file_t fd)
+void sg_file_dump(const_sg_file_t fd)
 {
   fd->dump();
 }
@@ -839,8 +840,7 @@ xbt_dict_t sg_storage_get_content(const_sg_storage_t storage)
   xbt_dict_t content_as_dict = xbt_dict_new_homogeneous(::operator delete);
 
   for (auto const& entry : *content) {
-    sg_size_t* psize = new sg_size_t;
-    *psize           = entry.second;
+    auto* psize = new sg_size_t(entry.second);
     xbt_dict_set(content_as_dict, entry.first.c_str(), psize);
   }
   return content_as_dict;