X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..54e818e2dea66d457ec7061f3f2bec19be321f39:/examples/s4u/dht-chord/s4u-dht-chord-node.cpp diff --git a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp index cc7cceca20..8d9640f064 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp +++ b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2019. 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. */ @@ -52,14 +52,9 @@ Node::Node(std::vector args) // initialize my node id_ = std::stoi(args[1]); - stream = simgrid::s4u::this_actor::get_host()->extension()->getStream(); mailbox_ = simgrid::s4u::Mailbox::by_name(std::to_string(id_)); next_finger_to_fix = 0; - fingers_ = new int[nb_bits]; - - for (int i = 0; i < nb_bits; i++) { - fingers_[i] = id_; - } + fingers_.resize(nb_bits, id_); if (args.size() == 3) { // first ring deadline_ = std::stod(args[2]); @@ -74,10 +69,6 @@ Node::Node(std::vector args) } } -Node::~Node() -{ - delete[] fingers_; -} /* Makes the current node join the ring, knowing the id of a node already in the ring * * @param known_id id of a node already in the ring @@ -118,7 +109,7 @@ void Node::notifyAndQuit() XBT_DEBUG("Sending a 'PREDECESSOR_LEAVING' to my successor %d", fingers_[0]); try { simgrid::s4u::Mailbox::by_name(std::to_string(fingers_[0]))->put(pred_msg, 10, timeout); - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Timeout expired when sending a 'PREDECESSOR_LEAVING' to my successor %d", fingers_[0]); delete pred_msg; } @@ -132,7 +123,7 @@ void Node::notifyAndQuit() try { simgrid::s4u::Mailbox::by_name(std::to_string(pred_id_))->put(succ_msg, 10, timeout); - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Timeout expired when sending a 'SUCCESSOR_LEAVING' to my predecessor %d", pred_id_); delete succ_msg; } @@ -143,7 +134,9 @@ void Node::notifyAndQuit() void Node::randomLookup() { int res = id_; - int random_index = RngStream_RandInt(stream, 0, nb_bits - 1); + // std::uniform_int_distribution dist(0, nb_bits - 1); + // int random_index = dist(generator); + int random_index = generator() % nb_bits; // ensure reproducibility across platforms int random_id = fingers_[random_index]; XBT_DEBUG("Making a lookup request for id %d", random_id); if (random_id != id_) @@ -212,8 +205,8 @@ void Node::checkPredecessor() if (pred_id_ == -1) return; - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(pred_id_)); - simgrid::s4u::MailboxPtr return_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_) + "_is_alive"); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(pred_id_)); + simgrid::s4u::Mailbox* return_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_) + "_is_alive"); ChordMessage* message = new ChordMessage(PREDECESSOR_ALIVE); message->request_id = pred_id_; @@ -222,7 +215,7 @@ void Node::checkPredecessor() XBT_DEBUG("Sending a 'Predecessor Alive' request to my predecessor %d", pred_id_); try { mailbox->put(message, 10, timeout); - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to send the 'Predecessor Alive' request to %d", pred_id_); delete message; return; @@ -237,7 +230,7 @@ void Node::checkPredecessor() comm->wait_for(timeout); XBT_DEBUG("Received the answer to my 'Predecessor Alive': my predecessor %d is alive", pred_id_); delete static_cast(data); - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to receive the answer to my 'Predecessor Alive' request"); pred_id_ = -1; } @@ -252,8 +245,8 @@ int Node::remoteGetPredecessor(int ask_to) { int predecessor_id = -1; void* data = nullptr; - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(ask_to)); - simgrid::s4u::MailboxPtr return_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_) + "_pred"); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(ask_to)); + simgrid::s4u::Mailbox* return_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_) + "_pred"); ChordMessage* message = new ChordMessage(GET_PREDECESSOR); message->request_id = id_; @@ -263,7 +256,7 @@ int Node::remoteGetPredecessor(int ask_to) XBT_DEBUG("Sending a 'Get Predecessor' request to %d", ask_to); try { mailbox->put(message, 10, timeout); - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to send the 'Get Predecessor' request to %d", ask_to); delete message; return predecessor_id; @@ -281,7 +274,7 @@ int Node::remoteGetPredecessor(int ask_to) answer->answer_id); predecessor_id = answer->answer_id; delete answer; - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to receive the answer to my 'Get Predecessor' request"); delete static_cast(data); } @@ -324,8 +317,8 @@ int Node::remoteFindSuccessor(int ask_to, int id) { int successor = -1; void* data = nullptr; - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(ask_to)); - simgrid::s4u::MailboxPtr return_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_) + "_succ"); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(ask_to)); + simgrid::s4u::Mailbox* return_mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_) + "_succ"); ChordMessage* message = new ChordMessage(FIND_SUCCESSOR); message->request_id = id_; @@ -335,7 +328,7 @@ int Node::remoteFindSuccessor(int ask_to, int id) XBT_DEBUG("Sending a 'Find Successor' request to %d for id %d", ask_to, id); try { mailbox->put(message, 10, timeout); - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to send the 'Find Successor' request to %d for id %d", ask_to, id_); delete message; return successor; @@ -351,7 +344,7 @@ int Node::remoteFindSuccessor(int ask_to, int id) answer->request_id, id_, answer->answer_id); successor = answer->answer_id; delete answer; - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to receive the answer to my 'Find Successor' request"); delete static_cast(data); } @@ -379,7 +372,7 @@ void Node::remoteNotify(int notify_id, int predecessor_candidate_id) // send a "Notify" request to notify_id XBT_DEBUG("Sending a 'Notify' request to %d", notify_id); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(notify_id)); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(notify_id)); mailbox->put_init(message, 10)->detach(ChordMessage::destroy); } @@ -426,7 +419,7 @@ void Node::handleMessage(ChordMessage* message) int closest = closestPrecedingFinger(message->request_id); XBT_DEBUG("Forwarding the 'Find Successor' request for id %d to my closest preceding finger %d", message->request_id, closest); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(closest)); + simgrid::s4u::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(closest)); mailbox->put_init(message, 10)->detach(ChordMessage::destroy); } break;