save some hidden calls to Engine::get_instance

[simgrid.git] / teshsuite / s4u / concurrent_rw / concurrent_rw.cpp

diff --git a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
index 66fbe1e..d86661d 100644 (file)
--- a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
+++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2021. 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. */
@@ -7,33 +7,35 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u test");
 
+namespace sg4 = simgrid::s4u;
+
 static void host()
 {
-  simgrid::s4u::Storage* storage = simgrid::s4u::Storage::by_name("Disk1");
-  int id                         = simgrid::s4u::this_actor::get_pid();
-  XBT_INFO("process %d is writing!", id);
-  storage->write(3000000);
-  XBT_INFO("process %d goes to sleep for %d seconds", id, id);
-  simgrid::s4u::this_actor::sleep_for(id);
-  XBT_INFO("process %d is writing again!", id);
-  storage->write(3000000);
-  XBT_INFO("process %d goes to sleep for %d seconds", id, 6 - id);
-  simgrid::s4u::this_actor::sleep_for(6 - id);
-  XBT_INFO("process %d is reading!", id);
-  storage->read(3000000);
-  XBT_INFO("process %d goes to sleep for %d seconds", id, id);
-  simgrid::s4u::this_actor::sleep_for(id);
-  XBT_INFO("process %d is reading again!", id);
-  storage->read(3000000);
+  const sg4::Disk* disk = sg4::this_actor::get_host()->get_disks().front(); // Disk1
+  aid_t id              = sg4::this_actor::get_pid();
+  XBT_INFO("actor %ld is writing!", id);
+  disk->write(4000000);
+  XBT_INFO("actor %ld goes to sleep for %ld seconds", id, id);
+  sg4::this_actor::sleep_for(static_cast<double>(id));
+  XBT_INFO("actor %ld is writing again!", id);
+  disk->write(4000000);
+  XBT_INFO("actor %ld goes to sleep for %ld seconds", id, 6 - id);
+  sg4::this_actor::sleep_for(static_cast<double>(6 - id));
+  XBT_INFO("actor %ld is reading!", id);
+  disk->read(4000000);
+  XBT_INFO("actor %ld goes to sleep for %ld seconds", id, id);
+  sg4::this_actor::sleep_for(static_cast<double>(id));
+  XBT_INFO("actor %ld is reading again!", id);
+  disk->read(4000000);
 }
 
 int main(int argc, char** argv)
 {
-  simgrid::s4u::Engine e(&argc, argv);
+  sg4::Engine e(&argc, argv);
   e.load_platform(argv[1]);
 
   for (int i = 0; i < 5; i++)
-    simgrid::s4u::Actor::create("host", simgrid::s4u::Host::by_name("bob"), host);
+    sg4::Actor::create("host", e.host_by_name("bob"), host);
 
   e.run();
   XBT_INFO("Simulation time %g", e.get_clock());