/* First step: Send a "FIND_NODE" request to the node we know */
sendFindNode(known_id, id_);
- simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(std::to_string(id_));
+ simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_));
do {
if (receive_comm == nullptr)
receive_comm = mailbox->get_async(&received_msg);
void Node::sendFindNode(unsigned int id, unsigned int destination)
{
/* Gets the mailbox to send to */
- simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(std::to_string(id));
+ simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id));
/* Build the task */
- Message* msg = new Message(id_, destination, simgrid::s4u::Mailbox::byName(std::to_string(id_)),
+ Message* msg = new Message(id_, destination, simgrid::s4u::Mailbox::by_name(std::to_string(id_)),
simgrid::s4u::Host::current()->get_cname());
/* Send the task */
unsigned int answers;
bool destination_found = false;
unsigned int nodes_added = 0;
- double global_timeout = simgrid::s4u::Engine::getClock() + find_node_global_timeout;
+ double global_timeout = simgrid::s4u::Engine::get_clock() + find_node_global_timeout;
unsigned int steps = 0;
/* First we build a list of who we already know */
answers = 0;
queries = sendFindNodeToBest(node_list);
nodes_added = 0;
- double timeout = simgrid::s4u::Engine::getClock() + find_node_timeout;
+ double timeout = simgrid::s4u::Engine::get_clock() + find_node_timeout;
steps++;
- double time_beginreceive = simgrid::s4u::Engine::getClock();
+ double time_beginreceive = simgrid::s4u::Engine::get_clock();
- simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::byName(std::to_string(id_));
+ simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(std::to_string(id_));
do {
if (receive_comm == nullptr)
receive_comm = mailbox->get_async(&received_msg);
handleFindNode(msg);
}
// Update the timeout if we didn't have our answer
- timeout += simgrid::s4u::Engine::getClock() - time_beginreceive;
- time_beginreceive = simgrid::s4u::Engine::getClock();
+ timeout += simgrid::s4u::Engine::get_clock() - time_beginreceive;
+ time_beginreceive = simgrid::s4u::Engine::get_clock();
}
delete msg->answer_;
delete msg;
} else {
simgrid::s4u::this_actor::sleep_for(1);
}
- } while (simgrid::s4u::Engine::getClock() < timeout && answers < queries);
+ } while (simgrid::s4u::Engine::get_clock() < timeout && answers < queries);
destination_found = node_list->destinationFound();
} while (not destination_found && (nodes_added > 0 || answers == 0) &&
- simgrid::s4u::Engine::getClock() < global_timeout && steps < MAX_STEPS);
+ simgrid::s4u::Engine::get_clock() < global_timeout && steps < MAX_STEPS);
if (destination_found) {
if (count_in_stats)
// Building the answer to the request
Message* answer =
new Message(id_, msg->destination_id_, findClosest(msg->destination_id_),
- simgrid::s4u::Mailbox::byName(std::to_string(id_)), simgrid::s4u::Host::current()->get_cname());
+ simgrid::s4u::Mailbox::by_name(std::to_string(id_)), simgrid::s4u::Host::current()->get_cname());
// Sending the answer
msg->answer_to_->put_init(answer, 1)->detach(kademlia::destroy);
}