X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb46f8ef11f386cac9f2da08028a93ee5e963b93..1692f2d57cbdd2bfffcba9481b96fb58fec34016:/examples/s4u/dht-kademlia/routing_table.cpp

diff --git a/examples/s4u/dht-kademlia/routing_table.cpp b/examples/s4u/dht-kademlia/routing_table.cpp
index d93a57f0d9..ffc664c8d2 100644
--- a/examples/s4u/dht-kademlia/routing_table.cpp
+++ b/examples/s4u/dht-kademlia/routing_table.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2017. The SimGrid Team.
+/* Copyright (c) 2012-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -14,29 +14,20 @@ namespace kademlia {
 /** @brief Initialization of a node routing table.  */
 RoutingTable::RoutingTable(unsigned int node_id) : id_(node_id)
 {
-  buckets = new Bucket*[identifier_size + 1];
-  for (unsigned int i = 0; i < identifier_size + 1; i++)
-    buckets[i]        = new Bucket(i);
+  buckets.reserve(IDENTIFIER_SIZE + 1);
+  for (unsigned int i = 0; i < IDENTIFIER_SIZE + 1; i++)
+    buckets.emplace_back(i);
 }
 
-RoutingTable::~RoutingTable()
-{
-  // Free the buckets.
-  for (unsigned int i = 0; i <= identifier_size; i++) {
-    delete buckets[i];
-  }
-  delete[] buckets;
-}
-
-void RoutingTable::print()
+void RoutingTable::print() const
 {
   XBT_INFO("Routing table of %08x:", id_);
 
-  for (unsigned int i = 0; i <= identifier_size; i++) {
-    if (not buckets[i]->nodes.empty()) {
+  for (unsigned int i = 0; i <= IDENTIFIER_SIZE; i++) {
+    if (not buckets[i].nodes.empty()) {
       XBT_INFO("Bucket number %u: ", i);
       int j = 0;
-      for (auto value : buckets[i]->nodes) {
+      for (auto value : buckets[i].nodes) {
         XBT_INFO("Element %d: %08x", j, value);
         j++;
       }
@@ -51,15 +42,15 @@ void RoutingTable::print()
 Bucket* RoutingTable::findBucket(unsigned int id)
 {
   unsigned int xor_number = id_ ^ id;
-  unsigned int prefix     = get_node_prefix(xor_number, identifier_size);
-  xbt_assert(prefix <= identifier_size, "Tried to return a  bucket that doesn't exist.");
-  return buckets[prefix];
+  unsigned int prefix     = get_node_prefix(xor_number, IDENTIFIER_SIZE);
+  xbt_assert(prefix <= IDENTIFIER_SIZE, "Tried to return a  bucket that doesn't exist.");
+  return &buckets[prefix];
 }
 
 /** Returns if the routing table contains the id. */
 bool RoutingTable::contains(unsigned int node_id)
 {
-  Bucket* bucket = findBucket(node_id);
+  const Bucket* bucket = findBucket(node_id);
   return std::find(bucket->nodes.begin(), bucket->nodes.end(), node_id) != bucket->nodes.end();
 }
 }