-/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2022. 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. */
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "simgrid/s4u/Mutex.hpp"
-#include <xbt/synchro.h>
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(mutex_handling, "Messages specific for this test");
static int receiver(const char* box_name)
{
auto mb = simgrid::s4u::Mailbox::by_name(box_name);
- const int* payload;
+ std::unique_ptr<int> payload;
- payload = static_cast<int*>(mb->get());
+ payload = mb->get_unique<int>();
MC_assert(*payload == 1);
- delete payload;
- payload = static_cast<int*>(mb->get());
+ payload = mb->get_unique<int>();
MC_assert(*payload == 2);
- delete payload;
return 0;
}
static int sender(const char* box_name, simgrid::s4u::MutexPtr mutex, int value)
{
- int* payload = new int(value);
+ auto* payload = new int(value);
auto mb = simgrid::s4u::Mailbox::by_name(box_name);
if (mutex)
mutex->lock();
- mb->put(static_cast<void*>(payload), 8);
+ mb->put(payload, 8);
if (mutex)
mutex->unlock();
int main(int argc, char* argv[])
{
simgrid::s4u::Engine e(&argc, argv);
- xbt_assert(argc > 1, "Usage: %s platform_file\n"
- "\tExample: %s msg_platform.xml\n",
+ xbt_assert(argc > 1,
+ "Usage: %s platform_file\n"
+ "\tExample: %s platform.xml\n",
argv[0], argv[0]);
simgrid::s4u::MutexPtr mutex;
#endif
e.load_platform(argv[1]);
- simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("Jupiter"), receiver, "box");
- simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("Boivin"), sender, "box", mutex, 1);
- simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("Fafard"), sender, "box", mutex, 2);
+ simgrid::s4u::Actor::create("receiver", e.host_by_name("Jupiter"), receiver, "box");
+ simgrid::s4u::Actor::create("sender", e.host_by_name("Boivin"), sender, "box", mutex, 1);
+ simgrid::s4u::Actor::create("sender", e.host_by_name("Fafard"), sender, "box", mutex, 2);
e.run();
- XBT_INFO("Simulation time %g", e.get_clock());
+ XBT_INFO("Simulation time %g", simgrid::s4u::Engine::get_clock());
return 0;
}