X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1671393f75bd162d50e64573db72c0e80cd137f..308bf9e4897e3606f017559cefabd29fb7eaec03:/examples/s4u/dht-chord/s4u-dht-chord-node.cpp?ds=sidebyside diff --git a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp index fbfdec60f3..dc2ef54b48 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord-node.cpp +++ b/examples/s4u/dht-chord/s4u-dht-chord-node.cpp @@ -104,7 +104,7 @@ void Node::leave() void Node::notifyAndQuit() { // send the PREDECESSOR_LEAVING to our successor - ChordMessage* pred_msg = new ChordMessage(PREDECESSOR_LEAVING); + auto* pred_msg = new ChordMessage(MessageType::PREDECESSOR_LEAVING); pred_msg->request_id = pred_id_; pred_msg->answer_to = mailbox_; @@ -118,7 +118,7 @@ void Node::notifyAndQuit() if (pred_id_ != -1 && pred_id_ != id_) { // send the SUCCESSOR_LEAVING to our predecessor (only if I have one that is not me) - ChordMessage* succ_msg = new ChordMessage(SUCCESSOR_LEAVING); + auto* succ_msg = new ChordMessage(MessageType::SUCCESSOR_LEAVING); succ_msg->request_id = fingers_[0]; succ_msg->answer_to = mailbox_; XBT_DEBUG("Sending a 'SUCCESSOR_LEAVING' to my predecessor %d", pred_id_); @@ -201,14 +201,13 @@ void Node::printFingerTable() void Node::checkPredecessor() { XBT_DEBUG("Checking whether my predecessor is alive"); - void* data = nullptr; if (pred_id_ == -1) return; 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); + auto* message = new ChordMessage(MessageType::PREDECESSOR_ALIVE); message->request_id = pred_id_; message->answer_to = return_mailbox; @@ -224,12 +223,13 @@ void Node::checkPredecessor() // receive the answer XBT_DEBUG("Sent 'Predecessor Alive' request to %d, waiting for the answer on my mailbox '%s'", pred_id_, message->answer_to->get_cname()); - simgrid::s4u::CommPtr comm = return_mailbox->get_async(&data); + ChordMessage* answer = nullptr; + simgrid::s4u::CommPtr comm = return_mailbox->get_async(&answer); try { comm->wait_for(timeout); XBT_DEBUG("Received the answer to my 'Predecessor Alive': my predecessor %d is alive", pred_id_); - delete static_cast(data); + delete answer; } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to receive the answer to my 'Predecessor Alive' request"); pred_id_ = -1; @@ -244,11 +244,10 @@ void Node::checkPredecessor() int Node::remoteGetPredecessor(int ask_to) { int predecessor_id = -1; - void* data = nullptr; 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); + auto* message = new ChordMessage(MessageType::GET_PREDECESSOR); message->request_id = id_; message->answer_to = return_mailbox; @@ -265,18 +264,18 @@ int Node::remoteGetPredecessor(int ask_to) // receive the answer XBT_DEBUG("Sent 'Get Predecessor' request to %d, waiting for the answer on my mailbox '%s'", ask_to, message->answer_to->get_cname()); - simgrid::s4u::CommPtr comm = return_mailbox->get_async(&data); + ChordMessage* answer = nullptr; + simgrid::s4u::CommPtr comm = return_mailbox->get_async(&answer); try { comm->wait_for(timeout); - const ChordMessage* answer = static_cast(data); XBT_DEBUG("Received the answer to my 'Get Predecessor' request: the predecessor of node %d is %d", ask_to, answer->answer_id); predecessor_id = answer->answer_id; delete answer; } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to receive the answer to my 'Get Predecessor' request"); - delete static_cast(data); + delete answer; } return predecessor_id; @@ -316,11 +315,10 @@ int Node::findSuccessor(int id) int Node::remoteFindSuccessor(int ask_to, int id) { int successor = -1; - ChordMessage* data = nullptr; 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); + auto* message = new ChordMessage(MessageType::FIND_SUCCESSOR); message->request_id = id_; message->answer_to = return_mailbox; @@ -335,18 +333,18 @@ int Node::remoteFindSuccessor(int ask_to, int id) } // receive the answer XBT_DEBUG("Sent a 'Find Successor' request to %d for key %d, waiting for the answer", ask_to, id); - simgrid::s4u::CommPtr comm = return_mailbox->get_async(reinterpret_cast(&data)); + ChordMessage* answer = nullptr; + simgrid::s4u::CommPtr comm = return_mailbox->get_async(&answer); try { comm->wait_for(timeout); - const ChordMessage* answer = data; XBT_DEBUG("Received the answer to my 'Find Successor' request for id %d: the successor of key %d is %d", answer->request_id, id_, answer->answer_id); successor = answer->answer_id; delete answer; } catch (const simgrid::TimeoutException&) { XBT_DEBUG("Failed to receive the answer to my 'Find Successor' request"); - delete data; + delete answer; } return successor; @@ -366,7 +364,7 @@ void Node::notify(int predecessor_candidate_id) /* Notifies a remote node that its predecessor may have changed. */ void Node::remoteNotify(int notify_id, int predecessor_candidate_id) const { - ChordMessage* message = new ChordMessage(NOTIFY); + auto* message = new ChordMessage(MessageType::NOTIFY); message->request_id = predecessor_candidate_id; message->answer_to = nullptr; @@ -403,77 +401,78 @@ void Node::stabilize() void Node::handleMessage(ChordMessage* message) { switch (message->type) { - case FIND_SUCCESSOR: - XBT_DEBUG("Received a 'Find Successor' request from %s for id %d", message->issuer_host_name.c_str(), - message->request_id); - // is my successor the successor? - if (is_in_interval(message->request_id, id_ + 1, fingers_[0])) { - message->type = FIND_SUCCESSOR_ANSWER; - message->answer_id = fingers_[0]; - XBT_DEBUG("Sending back a 'Find Successor Answer' to %s (mailbox %s): the successor of %d is %d", - message->issuer_host_name.c_str(), message->answer_to->get_cname(), message->request_id, - message->answer_id); + case MessageType::FIND_SUCCESSOR: + XBT_DEBUG("Received a 'Find Successor' request from %s for id %d", message->issuer_host_name.c_str(), + message->request_id); + // is my successor the successor? + if (is_in_interval(message->request_id, id_ + 1, fingers_[0])) { + message->type = MessageType::FIND_SUCCESSOR_ANSWER; + message->answer_id = fingers_[0]; + XBT_DEBUG("Sending back a 'Find Successor Answer' to %s (mailbox %s): the successor of %d is %d", + message->issuer_host_name.c_str(), message->answer_to->get_cname(), message->request_id, + message->answer_id); + message->answer_to->put_init(message, 10)->detach(ChordMessage::destroy); + } else { + // otherwise, forward the request to the closest preceding finger in my table + 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::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(closest)); + mailbox->put_init(message, 10)->detach(ChordMessage::destroy); + } + break; + + case MessageType::GET_PREDECESSOR: + XBT_DEBUG("Receiving a 'Get Predecessor' request from %s", message->issuer_host_name.c_str()); + message->type = MessageType::GET_PREDECESSOR_ANSWER; + message->answer_id = pred_id_; + XBT_DEBUG("Sending back a 'Get Predecessor Answer' to %s via mailbox '%s': my predecessor is %d", + message->issuer_host_name.c_str(), message->answer_to->get_cname(), message->answer_id); message->answer_to->put_init(message, 10)->detach(ChordMessage::destroy); - } else { - // otherwise, forward the request to the closest preceding finger in my table - 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::Mailbox* mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(closest)); - mailbox->put_init(message, 10)->detach(ChordMessage::destroy); - } - break; - - case GET_PREDECESSOR: - XBT_DEBUG("Receiving a 'Get Predecessor' request from %s", message->issuer_host_name.c_str()); - message->type = GET_PREDECESSOR_ANSWER; - message->answer_id = pred_id_; - XBT_DEBUG("Sending back a 'Get Predecessor Answer' to %s via mailbox '%s': my predecessor is %d", - message->issuer_host_name.c_str(), message->answer_to->get_cname(), message->answer_id); - message->answer_to->put_init(message, 10)->detach(ChordMessage::destroy); - break; - - case NOTIFY: - // someone is telling me that he may be my new predecessor - XBT_DEBUG("Receiving a 'Notify' request from %s", message->issuer_host_name.c_str()); - notify(message->request_id); - delete message; - break; + break; + + case MessageType::NOTIFY: + // someone is telling me that he may be my new predecessor + XBT_DEBUG("Receiving a 'Notify' request from %s", message->issuer_host_name.c_str()); + notify(message->request_id); + delete message; + break; + + case MessageType::PREDECESSOR_LEAVING: + // my predecessor is about to quit + XBT_DEBUG("Receiving a 'Predecessor Leaving' message from %s", message->issuer_host_name.c_str()); + // modify my predecessor + setPredecessor(message->request_id); + delete message; + /*TODO : + >> notify my new predecessor + >> send a notify_predecessors !! + */ + break; + + case MessageType::SUCCESSOR_LEAVING: + // my successor is about to quit + XBT_DEBUG("Receiving a 'Successor Leaving' message from %s", message->issuer_host_name.c_str()); + // modify my successor FIXME : this should be implicit ? + setFinger(0, message->request_id); + delete message; + /* TODO + >> notify my new successor + >> update my table & predecessors table */ + break; + + case MessageType::PREDECESSOR_ALIVE: + XBT_DEBUG("Receiving a 'Predecessor Alive' request from %s", message->issuer_host_name.c_str()); + message->type = MessageType::PREDECESSOR_ALIVE_ANSWER; + XBT_DEBUG("Sending back a 'Predecessor Alive Answer' to %s (mailbox %s)", message->issuer_host_name.c_str(), + message->answer_to->get_cname()); + message->answer_to->put_init(message, 10)->detach(ChordMessage::destroy); + break; - case PREDECESSOR_LEAVING: - // my predecessor is about to quit - XBT_DEBUG("Receiving a 'Predecessor Leaving' message from %s", message->issuer_host_name.c_str()); - // modify my predecessor - setPredecessor(message->request_id); - delete message; - /*TODO : - >> notify my new predecessor - >> send a notify_predecessors !! - */ - break; - - case SUCCESSOR_LEAVING: - // my successor is about to quit - XBT_DEBUG("Receiving a 'Successor Leaving' message from %s", message->issuer_host_name.c_str()); - // modify my successor FIXME : this should be implicit ? - setFinger(0, message->request_id); - delete message; - /* TODO - >> notify my new successor - >> update my table & predecessors table */ - break; - - case PREDECESSOR_ALIVE: - XBT_DEBUG("Receiving a 'Predecessor Alive' request from %s", message->issuer_host_name.c_str()); - message->type = PREDECESSOR_ALIVE_ANSWER; - XBT_DEBUG("Sending back a 'Predecessor Alive Answer' to %s (mailbox %s)", message->issuer_host_name.c_str(), - message->answer_to->get_cname()); - message->answer_to->put_init(message, 10)->detach(ChordMessage::destroy); - break; - - default: - XBT_DEBUG("Ignoring unexpected message: %d from %s", message->type, message->issuer_host_name.c_str()); - delete message; + default: + XBT_DEBUG("Ignoring unexpected message: %d from %s", static_cast(message->type), + message->issuer_host_name.c_str()); + delete message; } } @@ -490,7 +489,7 @@ void Node::operator()() if (not joined) return; - void* data = nullptr; + ChordMessage* message = nullptr; double now = simgrid::s4u::Engine::get_clock(); double next_stabilize_date = start_time_ + PERIODIC_STABILIZE_DELAY; double next_fix_fingers_date = start_time_ + PERIODIC_FIX_FINGERS_DELAY; @@ -499,7 +498,7 @@ void Node::operator()() simgrid::s4u::CommPtr comm_receive = nullptr; while (now < std::min(start_time_ + deadline_, MAX_SIMULATION_TIME)) { if (comm_receive == nullptr) - comm_receive = mailbox_->get_async(&data); + comm_receive = mailbox_->get_async(&message); bool comm_completed = true; try { if (not comm_receive->test()) @@ -509,10 +508,9 @@ void Node::operator()() } if (comm_completed) { - if (data != nullptr) { - ChordMessage* message = static_cast(data); + if (message != nullptr) { handleMessage(message); - data = nullptr; + message = nullptr; } comm_receive = nullptr; } else { @@ -540,7 +538,7 @@ void Node::operator()() if (comm_receive != nullptr) { try { if (comm_receive->test()) - delete static_cast(data); + delete message; else comm_receive->cancel(); } catch (const simgrid::TimeoutException&) {