X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f55b05623edc8e86b27ce69b080fa5e5f6388de..7cee0f64a84b4459068dc23ff23e491a3e3b288b:/examples/s4u/io-file-remote/s4u-io-file-remote.cpp

diff --git a/examples/s4u/io-file-remote/s4u-io-file-remote.cpp b/examples/s4u/io-file-remote/s4u-io-file-remote.cpp
index 46fbede2e3..6cbd818f10 100644
--- a/examples/s4u/io-file-remote/s4u-io-file-remote.cpp
+++ b/examples/s4u/io-file-remote/s4u-io-file-remote.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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. */
 
+#include <simgrid/plugins/file_system.h>
 #include <simgrid/s4u.hpp>
-#include <src/plugins/file_system/FileSystem.hpp>
 #include <string>
 
 #define INMEGA (1024 * 1024)
@@ -13,37 +13,34 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(remote_io, "Messages specific for this io example")
 
 static int host(int argc, char* argv[])
 {
-  simgrid::s4u::File* file = new simgrid::s4u::File(argv[1], nullptr);
-  const char* filename     = file->getPath();
+  simgrid::s4u::File file(argv[1], nullptr);
+  const char* filename = file.get_path();
   XBT_INFO("Opened file '%s'", filename);
-  file->dump();
+  file.dump();
 
-  XBT_INFO("Try to read %llu from '%s'", file->size(), filename);
-  sg_size_t read = file->read(file->size());
-  XBT_INFO("Have read %llu from '%s'. Offset is now at: %llu", read, filename, file->tell());
-  XBT_INFO("Seek back to the begining of the stream...");
-  file->seek(0, SEEK_SET);
-  XBT_INFO("Offset is now at: %llu", file->tell());
-
-  delete file;
+  XBT_INFO("Try to read %llu from '%s'", file.size(), filename);
+  sg_size_t read = file.read(file.size());
+  XBT_INFO("Have read %llu from '%s'. Offset is now at: %llu", read, filename, file.tell());
+  XBT_INFO("Seek back to the beginning of the stream...");
+  file.seek(0, SEEK_SET);
+  XBT_INFO("Offset is now at: %llu", file.tell());
 
   if (argc > 5) {
-    file     = new simgrid::s4u::File(argv[2], nullptr);
-    filename = file->getPath();
+    simgrid::s4u::File remoteFile(argv[2], nullptr);
+    filename = remoteFile.get_path();
     XBT_INFO("Opened file '%s'", filename);
-    XBT_INFO("Try to write %llu MiB to '%s'", file->size() / 1024, filename);
-    sg_size_t write = file->write(file->size() * 1024);
+    XBT_INFO("Try to write %llu MiB to '%s'", remoteFile.size() / 1024, filename);
+    sg_size_t write = remoteFile.write(remoteFile.size() * 1024);
     XBT_INFO("Have written %llu bytes to '%s'.", write, filename);
 
     if (std::stoi(argv[5]) != 0) {
-      XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename, file->size(),
-               simgrid::s4u::Host::current()->getCname(), argv[3]);
-      file->remoteMove(simgrid::s4u::Host::by_name(argv[3]), argv[4]);
+      XBT_INFO("Move '%s' (of size %llu) from '%s' to '%s'", filename, remoteFile.size(),
+               simgrid::s4u::Host::current()->get_cname(), argv[3]);
+      remoteFile.remote_move(simgrid::s4u::Host::by_name(argv[3]), argv[4]);
     } else {
-      XBT_INFO("Copy '%s' (of size %llu) from '%s' to '%s'", filename, file->size(),
-               simgrid::s4u::Host::current()->getCname(), argv[3]);
-      file->remoteCopy(simgrid::s4u::Host::by_name(argv[3]), argv[4]);
-      delete file;
+      XBT_INFO("Copy '%s' (of size %llu) from '%s' to '%s'", filename, remoteFile.size(),
+               simgrid::s4u::Host::current()->get_cname(), argv[3]);
+      remoteFile.remote_copy(simgrid::s4u::Host::by_name(argv[3]), argv[4]);
     }
   }
 
@@ -54,22 +51,23 @@ int main(int argc, char** argv)
 {
   simgrid::s4u::Engine e(&argc, argv);
   sg_storage_file_system_init();
-  e.loadPlatform(argv[1]);
-  e.registerFunction("host", host);
-  e.loadDeployment(argv[2]);
+  e.load_platform(argv[1]);
+  e.register_function("host", host);
+  e.load_deployment(argv[2]);
+  std::vector<simgrid::s4u::Storage*> allStorages = e.get_all_storages();
 
-  for (auto const& s : *simgrid::s4u::allStorages()) {
-    XBT_INFO("Init: %llu/%llu MiB used/free on '%s'", sg_storage_get_size_used(s.second) / INMEGA,
-             sg_storage_get_size_free(s.second) / INMEGA, s.second->getCname());
+  for (auto const& s : allStorages) {
+    XBT_INFO("Init: %llu/%llu MiB used/free on '%s'", sg_storage_get_size_used(s) / INMEGA,
+             sg_storage_get_size_free(s) / INMEGA, s->get_cname());
   }
 
   e.run();
 
-  for (auto const& s : *simgrid::s4u::allStorages()) {
-    XBT_INFO("End: %llu/%llu MiB used/free on '%s'", sg_storage_get_size_used(s.second) / INMEGA,
-             sg_storage_get_size_free(s.second) / INMEGA, s.second->getCname());
+  for (auto const& s : allStorages) {
+    XBT_INFO("End: %llu/%llu MiB used/free on '%s'", sg_storage_get_size_used(s) / INMEGA,
+             sg_storage_get_size_free(s) / INMEGA, s->get_cname());
   }
 
-  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::getClock());
+  XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
   return 0;
 }