X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cf8dfbfab4595b3e7ae85d3cd89ce9dbcdd7a24..c055a4846388b726f1c2056b601b71273e0db7d9:/examples/s4u/io/s4u_io.cpp

diff --git a/examples/s4u/io/s4u_io.cpp b/examples/s4u/io/s4u_io.cpp
index 20a3db2975..a62a5ebc54 100644
--- a/examples/s4u/io/s4u_io.cpp
+++ b/examples/s4u/io/s4u_io.cpp
@@ -3,22 +3,17 @@
 /* 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 <map>
 #include <unordered_map>
-#include <vector>
 
-#include "simgrid/s4u.h"
+#include "simgrid/s4u.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
 
-class myHost : simgrid::s4u::Actor {
+class MyHost {
 public:
-  myHost(const char*procname, simgrid::s4u::Host *host,int argc, char **argv)
-: simgrid::s4u::Actor(procname,host,argc,argv){}
 
   void show_info(boost::unordered_map <std::string, simgrid::s4u::Storage*> const&mounts) {
-    XBT_INFO("Storage info on %s:",
-      simgrid::s4u::Host::current()->name().c_str());
+    XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->cname());
 
     for (const auto&kv : mounts) {
       const char* mountpoint = kv.first.c_str();
@@ -34,27 +29,26 @@ public:
     }
   }
 
-  int main(int argc, char **argv) {
+  void operator()() {
     boost::unordered_map <std::string, simgrid::s4u::Storage *> const& mounts =
       simgrid::s4u::Host::current()->mountedStorages();
 
     show_info(mounts);
 
     // Open an non-existing file to create it
-    const char *filename = "/home/tmp/data.txt";
-    simgrid::s4u::File *file = new simgrid::s4u::File(filename, NULL);
-    sg_size_t write, read, file_size;
+    const char* filename = "/home/tmp/data.txt";
+    simgrid::s4u::File* file = new simgrid::s4u::File(filename, nullptr);
 
-    write = file->write(200000);  // Write 200,000 bytes
+    sg_size_t write = file->write(200000);  // Write 200,000 bytes
     XBT_INFO("Create a %llu bytes file named '%s' on /sd1", write, filename);
 
     // check that sizes have changed
     show_info(mounts);
 
     // Now retrieve the size of created file and read it completely
-    file_size = file->size();
+    const sg_size_t file_size = file->size();
     file->seek(0);
-    read = file->read(file_size);
+    const sg_size_t read = file->read(file_size);
     XBT_INFO("Read %llu bytes on %s", read, filename);
 
     // Now write 100,000 bytes in tmp/data.txt
@@ -71,6 +65,7 @@ public:
     // Test attaching some user data to the file
     file->setUserdata(xbt_strdup("777"));
     XBT_INFO("User data attached to the file: %s", (char*)file->userdata());
+    xbt_free(file->userdata());
 
     // Close the file
     delete file;
@@ -82,34 +77,15 @@ public:
     storage.setUserdata(xbt_strdup("Some user data"));
     XBT_INFO("    Set and get data: '%s'", (char*)storage.userdata());
 
-    /*
-      // Dump disks contents
-      XBT_INFO("*** Dump content of %s ***",Host::current()->name());
-      xbt_dict_t contents = NULL;
-      contents = MSG_host_get_storage_content(MSG_host_self()); // contents is a dict of dicts
-      xbt_dict_cursor_t curs, curs2 = NULL;
-      char* mountname;
-      xbt_dict_t content;
-      char* path;
-      sg_size_t *size;
-      xbt_dict_foreach(contents, curs, mountname, content){
-        XBT_INFO("Print the content of mount point: %s",mountname);
-        xbt_dict_foreach(content,curs2,path,size){
-           XBT_INFO("%s size: %llu bytes", path,*((sg_size_t*)size));
-        }
-      xbt_dict_free(&content);
-      }
-      xbt_dict_free(&contents);
-     */
-    return 0;
+    xbt_free(storage.userdata());
   }
 };
 
-int main(int argc, char **argv) {
+int main(int argc, char **argv)
+{
   simgrid::s4u::Engine *e = new simgrid::s4u::Engine(&argc,argv);
   e->loadPlatform("../../platforms/storage/storage.xml");
-
-  new myHost("host", simgrid::s4u::Host::by_name("denise"), 0, NULL);
+  simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("denise"), MyHost());
   e->run();
   return 0;
 }