X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5b29830df70e823202e384a7655e4371193ecd7..53782855f0f3041e92f763891722e8a253479451:/teshsuite/s4u/storage_client_server/storage_client_server.cpp diff --git a/teshsuite/s4u/storage_client_server/storage_client_server.cpp b/teshsuite/s4u/storage_client_server/storage_client_server.cpp index 0dcfafd4cf..85eabc7569 100644 --- a/teshsuite/s4u/storage_client_server/storage_client_server.cpp +++ b/teshsuite/s4u/storage_client_server/storage_client_server.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015, 2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2017. 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. */ @@ -57,7 +56,7 @@ static void hsm_put(const char* remote_host, const char* src, const char* dest) XBT_INFO("%s sends %llu to %s", simgrid::s4u::this_actor::name().c_str(), read_size, remote_host); char* payload = bprintf("%s %llu", dest, read_size); simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(remote_host); - simgrid::s4u::this_actor::send(mailbox, payload, static_cast(read_size)); + mailbox->send(payload, static_cast(read_size)); simgrid::s4u::this_actor::sleep_for(.4); } @@ -131,7 +130,7 @@ static void client() hsm_put("alice", "/home/doc/simgrid/examples/msg/alias/masterslave_forwarder_with_alias.c", "c:\\Windows\\tata.c"); simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName("alice"); - simgrid::s4u::this_actor::send(mailbox, xbt_strdup("finalize"), 0); + mailbox->send(xbt_strdup("finalize"), 0); get_set_storage_data("Disk1"); } @@ -143,7 +142,7 @@ static void server() XBT_INFO("Server waiting for transfers ..."); while (1) { - char* msg = static_cast(simgrid::s4u::this_actor::recv(mailbox)); + char* msg = static_cast(mailbox->recv()); if (not strcmp(msg, "finalize")) { // Shutdown ... xbt_free(msg); break; @@ -173,5 +172,6 @@ int main(int argc, char* argv[]) XBT_INFO("Simulated time: %g", e->getClock()); + delete e; return 0; }