X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/926f31504062e8af5960555834671fae6b02087a..6847a26d9973030337f6ef9f18464b1f04ce7452:/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 0c1db3c605..8378e8e84d 100644 --- a/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp +++ b/teshsuite/s4u/concurrent_rw/concurrent_rw.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-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. */ @@ -10,7 +10,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u test"); static void host() { simgrid::s4u::Storage* storage = simgrid::s4u::Storage::byName("Disk1"); - int id = simgrid::s4u::this_actor::getPid(); + 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); @@ -29,15 +29,14 @@ static void host() int main(int argc, char** argv) { - simgrid::s4u::Engine* e = new simgrid::s4u::Engine(&argc, argv); - e->loadPlatform(argv[1]); + simgrid::s4u::Engine e(&argc, argv); + e.loadPlatform(argv[1]); for (int i = 0; i < 5; i++) - simgrid::s4u::Actor::createActor("host", simgrid::s4u::Host::by_name("bob"), host); + simgrid::s4u::Actor::create("host", simgrid::s4u::Host::by_name("bob"), host); - e->run(); - XBT_INFO("Simulation time %g", e->getClock()); + e.run(); + XBT_INFO("Simulation time %g", e.getClock()); - delete e; return 0; }