rename a C++-only header with the '.hpp' suffix

[simgrid.git] / examples / s4u / io / s4u_io.cpp

diff --git a/examples/s4u/io/s4u_io.cpp b/examples/s4u/io/s4u_io.cpp
index 20a3db2..e9ebf57 100644 (file)
--- a/examples/s4u/io/s4u_io.cpp
+++ b/examples/s4u/io/s4u_io.cpp
@@ -3,18 +3,14 @@
 /* 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:",
@@ -34,7 +30,7 @@ public:
     }
   }
 
-  int main(int argc, char **argv) {
+  void operator()() {
     boost::unordered_map <std::string, simgrid::s4u::Storage *> const& mounts =
       simgrid::s4u::Host::current()->mountedStorages();
 
@@ -43,18 +39,17 @@ public:
     // 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;
 
-    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
@@ -101,15 +96,14 @@ public:
       }
       xbt_dict_free(&contents);
      */
-    return 0;
   }
 };
 
-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;
 }