#include "answer.h"
#include "node.h"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg_kademlia_node);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(dht_kademlia_node);
/** Initialize a node answer object. */
answer_t answer_init(unsigned int destination_id)
{
- answer_t answer = xbt_new(s_answer_t, 1);
- answer->nodes = xbt_dynar_new(sizeof(node_contact_t), NULL);
- answer->size = 0;
+ answer_t answer = xbt_new(s_answer_t, 1);
+ answer->nodes = xbt_dynar_new(sizeof(node_contact_t), NULL);
+ answer->size = 0;
answer->destination_id = destination_id;
return answer;
{
unsigned int i;
for (i = 0; i < answer->size; i++) {
- node_contact_free(*(void **) xbt_dynar_get_ptr(answer->nodes, i));
+ node_contact_free(*(void**)xbt_dynar_get_ptr(answer->nodes, i));
}
xbt_dynar_free(&answer->nodes);
xbt_free(answer);
unsigned int cpt;
node_contact_t contact;
XBT_INFO("Searching %08x, size %u", answer->destination_id, answer->size);
- xbt_dynar_foreach(answer->nodes, cpt, contact) {
+ xbt_dynar_foreach (answer->nodes, cpt, contact) {
XBT_INFO("Node %08x: %08x is at distance %u", cpt, contact->id, contact->distance);
}
}
/** @brief Merge two answer_t together, only keeping the best nodes
- * @param destination the destination in which the nodes will be put
- * @param source the source of the nodes to add
- */
+ * @param destination the destination in which the nodes will be put
+ * @param source the source of the nodes to add
+ */
unsigned int answer_merge(answer_t destination, const_answer_t source)
{
+ if (destination == source)
+ return 0;
+
node_contact_t contact;
node_contact_t contact_copy;
unsigned int cpt;
unsigned int nb_added = 0;
/* TODO: Check if same destination */
- xbt_dynar_foreach(source->nodes, cpt, contact) {
+ xbt_dynar_foreach (source->nodes, cpt, contact) {
if (answer_contains(destination, contact->id) == 0) {
contact_copy = node_contact_copy(contact);
xbt_dynar_push(destination->nodes, &contact_copy);
}
/** Helper to sort answer_t objects */
-static int _answer_sort_function(const void *e1, const void *e2)
+static int _answer_sort_function(const void* e1, const void* e2)
{
const s_node_contact_t* c1 = *(const node_contact_t*)e1;
const s_node_contact_t* c2 = *(const node_contact_t*)e2;
if (c1->distance == c2->distance)
return 0;
+ else if (c1->distance < c2->distance)
+ return -1;
else
- if (c1->distance < c2->distance)
- return -1;
- else
- return 1;
+ return 1;
}
/** @brief Sorts a answer_t, by node distance.
- * @param answer the answer to sort
- * @param destination_id the id of the guy we are trying to find
- */
+ * @param answer the answer to sort
+ * @param destination_id the id of the guy we are trying to find
+ */
void answer_sort(const_answer_t answer)
{
xbt_dynar_sort(answer->nodes, &_answer_sort_function);
}
/** @brief Trims a answer_t, in order for it to have a size of less or equal to "BUCKET_SIZE"
- * @param answer the answer_t to trim
- */
+ * @param answer the answer_t to trim
+ */
void answer_trim(answer_t answer)
{
node_contact_t value;
}
/** @brief Adds the content of a bucket unsigned into a answer object.
- * @param bucket the bucket we have to had unsigned into
- * @param answer the answer object we're going to put the data in
- * @param destination_id the id of the guy we are trying to find.
- */
+ * @param bucket the bucket we have to had unsigned into
+ * @param answer the answer object we're going to put the data in
+ * @param destination_id the id of the guy we are trying to find.
+ */
void answer_add_bucket(const_bucket_t bucket, answer_t answer)
{
xbt_assert((bucket != NULL), "Provided a NULL bucket");
unsigned int cpt;
unsigned int id;
- xbt_dynar_foreach(bucket->nodes, cpt, id) {
+ xbt_dynar_foreach (bucket->nodes, cpt, id) {
unsigned int distance = id ^ answer->destination_id;
node_contact_t contact = node_contact_new(id, distance);
xbt_dynar_push(answer->nodes, &contact);
}
/** @brief Returns if the id supplied is in the answer.
- * @param id : id we're looking for
- */
+ * @param id : id we're looking for
+ */
unsigned int answer_contains(const_answer_t answer, unsigned int id)
{
unsigned int i = 0;
node_contact_t contact;
- xbt_dynar_foreach(answer->nodes, i, contact){
+ xbt_dynar_foreach (answer->nodes, i, contact) {
if (id == contact->id) {
return 1;
}
}
/** @brief Returns if the destination we are trying to find is found
- * @param answer the answer
- * @return if the destination is found.
- */
+ * @param answer the answer
+ * @return if the destination is found.
+ */
unsigned int answer_destination_found(const_answer_t answer)
{
if (xbt_dynar_is_empty(answer->nodes)) {
