X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20fb1d8f699a02bdfd23130097cf7cf3d11f5840..9caf173e476622d309cc5653a83d224d05787cc7:/examples/s4u/cloud-simple/s4u-cloud-simple.cpp?ds=sidebyside

diff --git a/examples/s4u/cloud-simple/s4u-cloud-simple.cpp b/examples/s4u/cloud-simple/s4u-cloud-simple.cpp
index 61f0bd75a7..b1fb9508dd 100644
--- a/examples/s4u/cloud-simple/s4u-cloud-simple.cpp
+++ b/examples/s4u/cloud-simple/s4u-cloud-simple.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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. */
@@ -15,8 +15,8 @@ static void computation_fun()
   simgrid::s4u::this_actor::execute(1000000);
   double clock_end = simgrid::s4u::Engine::getClock();
 
-  XBT_INFO("%s:%s task executed %g", simgrid::s4u::this_actor::getHost()->getCname(),
-           simgrid::s4u::this_actor::getCname(), clock_end - clock_sta);
+  XBT_INFO("%s:%s task executed %g", simgrid::s4u::this_actor::getHost()->get_cname(),
+           simgrid::s4u::this_actor::get_cname(), clock_end - clock_sta);
 }
 
 static void launch_computation_worker(s4u_Host* host)
@@ -33,8 +33,8 @@ struct s_payload {
 static void communication_tx_fun(std::vector<std::string> args)
 {
   simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(args.at(0));
-  struct s_payload* payload     = xbt_new(struct s_payload, 1);
-  payload->tx_actor_name        = simgrid::s4u::Actor::self()->getCname();
+  s_payload* payload            = new s_payload;
+  payload->tx_actor_name        = simgrid::s4u::Actor::self()->get_cname();
   payload->tx_host              = simgrid::s4u::this_actor::getHost();
   payload->clock_sta            = simgrid::s4u::Engine::getClock();
 
@@ -43,22 +43,22 @@ static void communication_tx_fun(std::vector<std::string> args)
 
 static void communication_rx_fun(std::vector<std::string> args)
 {
-  const char* actor_name        = simgrid::s4u::Actor::self()->getCname();
-  const char* host_name         = simgrid::s4u::this_actor::getHost()->getCname();
+  const char* actor_name        = simgrid::s4u::Actor::self()->get_cname();
+  const char* host_name         = simgrid::s4u::this_actor::getHost()->get_cname();
   simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::byName(args.at(0));
 
   struct s_payload* payload = static_cast<struct s_payload*>(mbox->get());
   double clock_end          = simgrid::s4u::Engine::getClock();
 
-  XBT_INFO("%s:%s to %s:%s => %g sec", payload->tx_host->getCname(), payload->tx_actor_name, host_name, actor_name,
+  XBT_INFO("%s:%s to %s:%s => %g sec", payload->tx_host->get_cname(), payload->tx_actor_name, host_name, actor_name,
            clock_end - payload->clock_sta);
 
-  xbt_free(payload);
+  delete payload;
 }
 
 static void launch_communication_worker(s4u_Host* tx_host, s4u_Host* rx_host)
 {
-  std::string mbox_name = std::string("MBOX:") + tx_host->getCname() + "-" + rx_host->getCname();
+  std::string mbox_name = std::string("MBOX:") + tx_host->get_cname() + "-" + rx_host->get_cname();
   std::vector<std::string> args;
   args.push_back(mbox_name);
 
@@ -193,9 +193,6 @@ static void master_main()
            " network one");
   XBT_INFO("### Relocate VM0 between PM0 and PM1");
   vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
-  s_vm_params_t params;
-  memset(&params, 0, sizeof(params));
-  vm0->setParameters(&params);
   vm0->setRamsize(1L * 1024 * 1024 * 1024); // 1GiB
 
   vm0->start();