X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e7fd02bb2873388f1cacd8458104c37db9068208..c6683b41cf9ecda70c1d4d75d1effc61903a894f:/teshsuite/mc/mutex-handling/mutex-handling.cpp

diff --git a/teshsuite/mc/mutex-handling/mutex-handling.cpp b/teshsuite/mc/mutex-handling/mutex-handling.cpp
index 4a03cc7d7d..8f986360a2 100644
--- a/teshsuite/mc/mutex-handling/mutex-handling.cpp
+++ b/teshsuite/mc/mutex-handling/mutex-handling.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2023. 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. */
@@ -23,67 +23,58 @@
 #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");
+#include <mutex> // std::unique_lock
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(mutex_handling, "Messages specific for this test");
 
 static int receiver(const char* box_name)
 {
-  int* payload;
-  auto mb = simgrid::s4u::Mailbox::by_name(box_name);
-
-  payload = static_cast<int*>(mb->get());
-  MC_assert(*payload == 0);
-  free(payload);
+  auto* mb = simgrid::s4u::Mailbox::by_name(box_name);
+  std::unique_ptr<int> payload;
 
-  payload = static_cast<int*>(mb->get());
+  payload = mb->get_unique<int>();
   MC_assert(*payload == 1);
-  free(payload);
+
+  payload = mb->get_unique<int>();
+  MC_assert(*payload == 2);
 
   return 0;
 }
 
 static int sender(const char* box_name, simgrid::s4u::MutexPtr mutex, int value)
 {
-  int* payload = new int(value);
-  auto mb      = simgrid::s4u::Mailbox::by_name(box_name);
-
-#ifndef DISABLE_THE_MUTEX
-  mutex->lock();
-#endif
+  auto* payload = new int(value);
+  auto* mb      = simgrid::s4u::Mailbox::by_name(box_name);
 
-  mb->put(static_cast<void*>(payload), 8);
+  std::unique_lock<simgrid::s4u::Mutex> lock;
+  if (mutex)
+    lock = std::unique_lock(*mutex);
 
-#ifndef DISABLE_THE_MUTEX
-  mutex->unlock();
-#endif
+  mb->put(payload, 8);
   return 0;
 }
 
 int main(int argc, char* argv[])
 {
-  XBT_ATTRIB_UNUSED simgrid::s4u::MutexPtr mutex;
-#ifndef DISABLE_THE_MUTEX
-  mutex = simgrid::s4u::Mutex::create();
-#endif
-
   simgrid::s4u::Engine e(&argc, argv);
-  xbt_assert(argc > 2,
-             "Usage: %s platform_file deployment_file\n"
-             "\tExample: %s msg_platform.xml msg_deployment.xml\n",
+  xbt_assert(argc > 1,
+             "Usage: %s platform_file\n"
+             "\tExample: %s platform.xml\n",
              argv[0], argv[0]);
 
-  e.load_platform(argv[1]);
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("Tremblay"), sender, "box", mutex, 1);
-  simgrid::s4u::Actor::create("sender", simgrid::s4u::Host::by_name("Tremblay"), sender, "box", mutex, 2);
-  simgrid::s4u::Actor::create("receiver", simgrid::s4u::Host::by_name("Jupiter"), receiver, "box");
-
+  simgrid::s4u::MutexPtr mutex;
 #ifndef DISABLE_THE_MUTEX
   mutex = simgrid::s4u::Mutex::create();
 #endif
 
+  e.load_platform(argv[1]);
+  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;
 }