convert (and simplify a bit) dht-kademlia example

[simgrid.git] / examples / c / dht-kademlia / routing_table.c

diff --git a/examples/deprecated/msg/dht-kademlia/routing_table.c b/examples/c/dht-kademlia/routing_table.c
similarity index 79%
rename from examples/deprecated/msg/dht-kademlia/routing_table.c
rename to examples/c/dht-kademlia/routing_table.c
index 418040b..b8204f8 100644 (file)
--- a/examples/deprecated/msg/dht-kademlia/routing_table.c
+++ b/examples/c/dht-kademlia/routing_table.c
@@ -6,9 +6,8 @@
 
 #include "routing_table.h"
 #include "node.h"
-#include "simgrid/msg.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_kademlia_routing_table, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(dht_kademlia_routing_table, "Messages specific for this example");
 
 /** @brief Initialization of a node routing table.  */
 routing_table_t routing_table_init(unsigned int node_id)
@@ -17,7 +16,7 @@ routing_table_t routing_table_init(unsigned int node_id)
   table->buckets        = xbt_new(s_bucket_t, IDENTIFIER_SIZE + 1);
   for (unsigned int i = 0; i < IDENTIFIER_SIZE + 1; i++) {
     table->buckets[i].nodes = xbt_dynar_new(sizeof(unsigned int), NULL);
-    table->buckets[i].id = i;
+    table->buckets[i].id    = i;
   }
   table->id = node_id;
   return table;
@@ -27,7 +26,7 @@ routing_table_t routing_table_init(unsigned int node_id)
 void routing_table_free(routing_table_t table)
 {
   unsigned int i;
-  //Free the buckets.
+  // Free the buckets.
   for (i = 0; i <= IDENTIFIER_SIZE; i++) {
     xbt_dynar_free(&table->buckets[i].nodes);
   }
@@ -45,7 +44,7 @@ void routing_table_print(const_routing_table_t table)
   for (unsigned int i = 0; i <= IDENTIFIER_SIZE; i++) {
     if (!xbt_dynar_is_empty(table->buckets[i].nodes)) {
       XBT_INFO("Bucket number %u: ", i);
-      xbt_dynar_foreach(table->buckets[i].nodes, j, value) {
+      xbt_dynar_foreach (table->buckets[i].nodes, j, value) {
         XBT_INFO("Element %u: %08x", j, value);
       }
     }
@@ -53,15 +52,15 @@ void routing_table_print(const_routing_table_t table)
 }
 
 /** @brief Finds an identifier in a bucket and returns its position or returns -1 if it doesn't exists
-  * @param bucket the bucket in which we try to find our identifier
-  * @param id the id
-  */
+ * @param bucket the bucket in which we try to find our identifier
+ * @param id the id
+ */
 unsigned int bucket_find_id(const_bucket_t bucket, unsigned int id)
 {
   unsigned int i;
   unsigned int current_id;
-  xbt_dynar_foreach(bucket->nodes, i, current_id){
-    if (id == current_id){
+  xbt_dynar_foreach (bucket->nodes, i, current_id) {
+    if (id == current_id) {
       return i;
     }
   }
@@ -69,10 +68,10 @@ unsigned int bucket_find_id(const_bucket_t bucket, unsigned int id)
 }
 
 /** @brief Finds the corresponding bucket in a routing table for a given identifier
-  * @param table the routing table
-  * @param id the identifier
-  * @return the bucket in which the the identifier would be.
-  */
+ * @param table the routing table
+ * @param id the identifier
+ * @return the bucket in which the the identifier would be.
+ */
 bucket_t routing_table_find_bucket(const_routing_table_t table, unsigned int id)
 {
   unsigned int xor_number = table->id ^ id;