X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07e23d67fa051a2507972338c09151e69c1ad2d4..6574906fc7ef8966b3140b596df794b8e05cd504:/examples/s4u/io-file-system/s4u-io-file-system.cpp

diff --git a/examples/s4u/io-file-system/s4u-io-file-system.cpp b/examples/s4u/io-file-system/s4u-io-file-system.cpp
index 832d267821..bce3113fdb 100644
--- a/examples/s4u/io-file-system/s4u-io-file-system.cpp
+++ b/examples/s4u/io-file-system/s4u-io-file-system.cpp
@@ -15,14 +15,14 @@ class MyHost {
 public:
   void show_info(std::unordered_map<std::string, simgrid::s4u::Storage*> const& mounts)
   {
-    XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->getCname());
+    XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->get_cname());
 
     for (auto const& kv : mounts) {
       std::string mountpoint         = kv.first;
       simgrid::s4u::Storage* storage = kv.second;
 
       // Retrieve disk's information
-      XBT_INFO("    %s (%s) Used: %llu; Free: %llu; Total: %llu.", storage->getCname(), mountpoint.c_str(),
+      XBT_INFO("    %s (%s) Used: %llu; Free: %llu; Total: %llu.", storage->get_cname(), mountpoint.c_str(),
                sg_storage_get_size_used(storage), sg_storage_get_size_free(storage), sg_storage_get_size(storage));
     }
   }
@@ -30,7 +30,7 @@ public:
   void operator()()
   {
     std::unordered_map<std::string, simgrid::s4u::Storage*> const& mounts =
-        simgrid::s4u::Host::current()->getMountedStorages();
+        simgrid::s4u::Host::current()->get_mounted_storages();
 
     show_info(mounts);
 
@@ -54,16 +54,16 @@ public:
     write = file->write(100000); // Write 100,000 bytes
     XBT_INFO("Write %llu bytes on %s", write, filename.c_str());
 
-    simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName("Disk4");
+    simgrid::s4u::Storage* storage = simgrid::s4u::Storage::by_name("Disk4");
 
     // Now rename file from ./tmp/data.txt to ./tmp/simgrid.readme
     std::string newpath = "/home/tmp/simgrid.readme";
-    XBT_INFO("Move '%s' to '%s'", file->getPath(), newpath.c_str());
+    XBT_INFO("Move '%s' to '%s'", file->get_path(), newpath.c_str());
     file->move(newpath);
 
     // Test attaching some user data to the file
-    file->setUserdata(new std::string("777"));
-    std::string* file_data = static_cast<std::string*>(file->getUserdata());
+    file->set_userdata(new std::string("777"));
+    std::string* file_data = static_cast<std::string*>(file->get_userdata());
     XBT_INFO("User data attached to the file: %s", file_data->c_str());
     delete file_data;
 
@@ -71,18 +71,18 @@ public:
     delete file;
 
     // Now attach some user data to disk1
-    XBT_INFO("Get/set data for storage element: %s", storage->getCname());
-    XBT_INFO("    Uninitialized storage data: '%s'", static_cast<char*>(storage->getUserdata()));
+    XBT_INFO("Get/set data for storage element: %s", storage->get_cname());
+    XBT_INFO("    Uninitialized storage data: '%s'", static_cast<char*>(storage->get_data()));
 
-    storage->setUserdata(new std::string("Some user data"));
-    std::string* storage_data = static_cast<std::string*>(storage->getUserdata());
+    storage->set_data(new std::string("Some user data"));
+    std::string* storage_data = static_cast<std::string*>(storage->get_data());
     XBT_INFO("    Set and get data: '%s'", storage_data->c_str());
 
     delete storage_data;
 
     // Reopen the file and then unlink it
     file = new simgrid::s4u::File("/home/tmp/simgrid.readme", nullptr);
-    XBT_INFO("Unlink file: '%s'", file->getPath());
+    XBT_INFO("Unlink file: '%s'", file->get_path());
     file->unlink();
     delete file; // Unlinking the file on "disk" does not free the object
 
@@ -94,8 +94,8 @@ int main(int argc, char** argv)
 {
   simgrid::s4u::Engine e(&argc, argv);
   sg_storage_file_system_init();
-  e.loadPlatform(argv[1]);
-  simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("denise"), MyHost());
+  e.load_platform(argv[1]);
+  simgrid::s4u::Actor::create("host", simgrid::s4u::Host::by_name("denise"), MyHost());
   e.run();
 
   return 0;