static void coordinator()
{
int CS_used = 0;
- const Message* m = nullptr;
std::queue<simgrid::s4u::Mailbox*> requests;
simgrid::s4u::Mailbox* mbox = simgrid::s4u::Mailbox::by_name("coordinator");
- while (1) {
- m = static_cast<Message*>(mbox->get());
+ while (true) {
+ auto m = mbox->get_unique<Message>();
if (m->kind == Message::Kind::REQUEST) {
if (CS_used) {
XBT_INFO("CS already used. Queue the request.");
CS_used = 0;
}
}
- delete m;
}
}
static void client(int id)
{
- int my_pid = simgrid::s4u::this_actor::get_pid();
+ aid_t my_pid = simgrid::s4u::this_actor::get_pid();
simgrid::s4u::Mailbox* my_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id));
- while (1) {
+ while (true) {
XBT_INFO("Ask the request");
simgrid::s4u::Mailbox::by_name("coordinator")->put(new Message(Message::Kind::REQUEST, my_mailbox), 1000);
XBT_INFO("Propositions changed : r=1, cs=0");
}
- const Message* grant = static_cast<Message*>(my_mailbox->get());
+ auto grant = my_mailbox->get_unique<Message>();
if ((id == 1) && (grant->kind == Message::Kind::GRANT)) {
cs = 1;
XBT_INFO("Propositions changed : r=0, cs=1");
}
- delete grant;
-
XBT_INFO("%d got the answer. Sleep a bit and release it", id);
simgrid::s4u::this_actor::sleep_for(1);
simgrid::s4u::Mailbox::by_name("coordinator")->put(new Message(Message::Kind::RELEASE, my_mailbox), 1000);
- simgrid::s4u::this_actor::sleep_for(my_pid);
+ simgrid::s4u::this_actor::sleep_for(static_cast<double>(my_pid));
if (id == 1) {
cs = 0;
e.load_platform(argv[1]);
- simgrid::s4u::Actor::create("coordinator", simgrid::s4u::Host::by_name("Tremblay"), coordinator);
+ simgrid::s4u::Actor::create("coordinator", simgrid::s4u::Host::by_name("Tremblay"), coordinator)
+ ->set_kill_time(argc > 3 ? std::stod(argv[3]) : -1.0);
if (std::stod(argv[2]) == 0) {
simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Boivin"), raw_client, 1);
simgrid::s4u::Actor::create("client", simgrid::s4u::Host::by_name("Fafard"), raw_client, 2);