X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26f93d36882a4af53d1b797294caeae9efbf9b47..83749eb955aac66c4d679e819842c19b64a2dd32:/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp diff --git a/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp b/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp index 04db14bce4..828303af78 100644 --- a/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp +++ b/teshsuite/s4u/monkey-semaphore/monkey-semaphore.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ @@ -13,93 +13,96 @@ namespace sg4 = simgrid::s4u; XBT_LOG_NEW_DEFAULT_CATEGORY(sem_monkey, "Simple test of the semaphore"); -int buffer; /* Where the data is exchanged */ -sg4::SemaphorePtr sem_empty = sg4::Semaphore::create(1); /* indicates whether the buffer is empty */ -sg4::SemaphorePtr sem_full = sg4::Semaphore::create(0); /* indicates whether the buffer is full */ - static simgrid::config::Flag cfg_item_count{"item-count", "Amount of items that must be exchanged to succeed", 2}; static simgrid::config::Flag cfg_deadline{"deadline", "When to fail the simulation (infinite loop detection)", 120}; -int todo; // remaining amount of items to exchange +struct SharedBuffer { + int value = 0; /* Where the data is exchanged */ + sg4::SemaphorePtr sem_empty = sg4::Semaphore::create(1); /* indicates whether the buffer is empty */ + sg4::SemaphorePtr sem_full = sg4::Semaphore::create(0); /* indicates whether the buffer is full */ +}; // A stack to keep track of semaphores. When destroyed, semaphores remaining on stack are automatically released. class SemStack { std::vector to_release; public: - void push(sg4::SemaphorePtr& sem) { to_release.push_back(sem.get()); } - void pop() { to_release.pop_back(); } - ~SemStack() + void clear() { - for (auto* sem : to_release) { + while (not to_release.empty()) { + auto* sem = to_release.back(); + XBT_INFO("Go release a semaphore"); sem->release(); - XBT_INFO("Released a semaphore on exit. It's now %d", sem->get_capacity()); + XBT_INFO("Released a semaphore on reboot. It's now %d", sem->get_capacity()); + to_release.pop_back(); } } + void push(const sg4::SemaphorePtr& sem) { to_release.push_back(sem.get()); } + void pop() { to_release.pop_back(); } }; -static void producer() +static void producer(SharedBuffer& buf) { - static bool inited = false; - SemStack to_release; - XBT_INFO("Producer %s", inited ? "rebooting" : "booting"); + static int todo = cfg_item_count; // remaining amount of items to exchange + static SemStack to_release; + bool rebooting = sg4::Actor::self()->get_restart_count() > 0; - if (not inited) { + XBT_INFO("Producer %s", rebooting ? "rebooting" : "booting"); + if (not rebooting) // Starting for the first time sg4::this_actor::on_exit( [](bool forcefully) { XBT_INFO("Producer dying %s.", forcefully ? "forcefully" : "peacefully"); }); - inited = true; - } + to_release.clear(); while (todo > 0) { - xbt_assert(sg4::Engine::get_clock() < cfg_deadline, - "Failed to exchange all tasks in less than %d seconds. Is this an infinite loop?", (int)cfg_deadline); - sg4::this_actor::sleep_for(1); // Give a chance to the monkey to kill this actor at this point - while (sem_empty->acquire_timeout(10)) + while (buf.sem_empty->acquire_timeout(10)) { XBT_INFO("Timeouted"); - to_release.push(sem_empty); + xbt_assert(sg4::Engine::get_clock() < cfg_deadline, + "Failed to exchange all tasks in less than %d seconds. Is this an infinite loop?", (int)cfg_deadline); + } + to_release.push(buf.sem_empty); XBT_INFO("sem_empty acquired"); sg4::this_actor::sleep_for(1); // Give a chance to the monkey to kill this actor at this point XBT_INFO("Pushing item %d", todo - 1); - buffer = todo - 1; - sem_full->release(); + buf.value = todo - 1; + buf.sem_full->release(); to_release.pop(); XBT_INFO("sem_empty removed from to_release"); todo--; } } -static void consumer() + +static void consumer(const SharedBuffer& buf) { - SemStack to_release; + static SemStack to_release; + bool rebooting = sg4::Actor::self()->get_restart_count() > 0; - static bool inited = false; - XBT_INFO("Consumer %s", inited ? "rebooting" : "booting"); - if (not inited) { + XBT_INFO("Consumer %s", rebooting ? "rebooting" : "booting"); + if (not rebooting) // Starting for the first time sg4::this_actor::on_exit( [](bool forcefully) { XBT_INFO("Consumer dying %s.", forcefully ? "forcefully" : "peacefully"); }); - inited = true; - } + to_release.clear(); int item; do { - xbt_assert(sg4::Engine::get_clock() < cfg_deadline, - "Failed to exchange all tasks in less than %d seconds. Is this an infinite loop?", (int)cfg_deadline); - sg4::this_actor::sleep_for(0.75); // Give a chance to the monkey to kill this actor at this point - while (sem_full->acquire_timeout(10)) + while (buf.sem_full->acquire_timeout(10)) { XBT_INFO("Timeouted"); - to_release.push(sem_full); + xbt_assert(sg4::Engine::get_clock() < cfg_deadline, + "Failed to exchange all tasks in less than %d seconds. Is this an infinite loop?", (int)cfg_deadline); + } + to_release.push(buf.sem_full); sg4::this_actor::sleep_for(0.75); // Give a chance to the monkey to kill this actor at this point - item = buffer; + item = buf.value; XBT_INFO("Receiving item %d", item); - sem_empty->release(); + buf.sem_empty->release(); to_release.pop(); } while (item != 0); @@ -110,15 +113,15 @@ int main(int argc, char** argv) { sg4::Engine e(&argc, argv); - todo = cfg_item_count; auto* rootzone = sg4::create_full_zone("root"); auto* paul = rootzone->create_host("Paul", 1e9); auto* carol = rootzone->create_host("Carol", 1e9); sg4::LinkInRoute link(rootzone->create_link("link", "1MBps")->set_latency("24us")->seal()); rootzone->add_route(paul->get_netpoint(), carol->get_netpoint(), nullptr, nullptr, {link}, true); - sg4::Actor::create("producer", paul, producer)->set_auto_restart(); - sg4::Actor::create("consumer", carol, consumer)->set_auto_restart(); + SharedBuffer buffer; + sg4::Actor::create("producer", paul, producer, std::ref(buffer))->set_auto_restart(); + sg4::Actor::create("consumer", carol, consumer, std::cref(buffer))->set_auto_restart(); e.run(); return 0;