from datetime import datetime
from bisect import bisect_left
+from math import log as loge
from twisted.python import log
from twisted.trial import unittest
"""Find the index of the bucket that should hold the node's ID number."""
return bisect_left(self.buckets, num)
- def findNodes(self, id):
- """Find the K nodes in our own local table closest to the ID.
+ def _nodeNum(self, id):
+ """Takes different types of input and converts to the node ID number.
@type id: C{string} of C{int} or L{node.Node}
@param id: the ID to find nodes that are close to
# Get the ID number from the input
if isinstance(id, str):
- num = khash.intify(id)
+ return khash.intify(id)
elif isinstance(id, Node):
- num = id.num
+ return id.num
elif isinstance(id, int) or isinstance(id, long):
- num = id
+ return id
else:
- raise TypeError, "findNodes requires an int, string, or Node"
+ raise TypeError, "requires an int, string, or Node input"
- nodes = []
- i = self._bucketIndexForInt(num)
-
- # If this node is already in our table then return it
- try:
- index = self.buckets[i].l.index(num)
- except ValueError:
- pass
- else:
- return [self.buckets[i].l[index]]
+ def findNodes(self, id):
+ """Find the K nodes in our own local table closest to the ID.
+
+ @type id: C{string} of C{int} or L{node.Node}
+ @param id: the ID to find nodes that are close to
+ """
+
+ # Get the ID number from the input
+ num = self._nodeNum(id)
- # Don't have the node, get the K closest nodes from the appropriate bucket
- nodes = nodes + self.buckets[i].l
+ # Get the K closest nodes from the appropriate bucket
+ i = self._bucketIndexForInt(num)
+ nodes = list(self.buckets[i].l)
# Make sure we have enough
if len(nodes) < self.config['K']:
a.l.remove(anode)
b.l.append(anode)
+ def _mergeBucket(self, i):
+ """Merge unneeded buckets after removing a node.
+
+ @type i: C{int}
+ @param i: the index of the bucket that lost a node
+ """
+ bucketRange = self.buckets[i].max - self.buckets[i].min
+ otherBucket = None
+
+ # Find if either of the neighbor buckets is the same size
+ # (this will only happen if this or the neighbour has our node ID in its range)
+ if i-1 >= 0 and self.buckets[i-1].max - self.buckets[i-1].min == bucketRange:
+ otherBucket = i-1
+ elif i+1 < len(self.buckets) and self.buckets[i+1].max - self.buckets[i+1].min == bucketRange:
+ otherBucket = i+1
+
+ # Decide if we should do a merge
+ if otherBucket is not None and len(self.buckets[i].l) + len(self.buckets[otherBucket].l) <= self.config['K']:
+ # Remove one bucket and set the other to cover its range as well
+ b = self.buckets[i]
+ a = self.buckets.pop(otherBucket)
+ b.min = min(b.min, a.min)
+ b.max = max(b.max, a.max)
+
+ # Transfer the nodes to the bucket we're keeping, merging the sorting
+ bi = 0
+ for anode in a.l:
+ while bi < len(b.l) and b.l[bi].lastSeen <= anode.lastSeen:
+ bi += 1
+ b.l.insert(bi, anode)
+ bi += 1
+
+ # Recurse to check if the neighbour buckets can also be merged
+ self._mergeBucket(min(i, otherBucket))
+
def replaceStaleNode(self, stale, new = None):
"""Replace a stale node in a bucket with a new one.
not adding any node in the old node's place)
"""
# Find the stale node's bucket
+ removed = False
i = self._bucketIndexForInt(stale.num)
try:
it = self.buckets[i].l.index(stale.num)
except ValueError:
- return
-
- # Remove the stale node and insert the new one
- del(self.buckets[i].l[it])
- if new:
+ pass
+ else:
+ # Remove the stale node
+ del(self.buckets[i].l[it])
+ removed = True
+
+ # Insert the new node
+ if new and self._bucketIndexForInt(new.num) == i and len(self.buckets[i].l) < self.config['K']:
self.buckets[i].l.append(new)
+ elif removed:
+ self._mergeBucket(i)
def insertNode(self, node, contacted = True):
"""Try to insert a node in the routing table.
if node.id == self.node.id: return
# Get the bucket for this node
- i = self. _bucketIndexForInt(node.num)
+ i = self._bucketIndexForInt(node.num)
# Check to see if node is in the bucket already
try:
@rtype: C{datetime.datetime}
@return: the old lastSeen time of the node, or None if it's not in the table
"""
+ # Get the bucket number
+ num = self._nodeNum(id)
+ i = self._bucketIndexForInt(num)
+
+ # Check to see if node is in the bucket
try:
- n = self.findNodes(id)[0]
- except IndexError:
+ it = self.buckets[i].l.index(num)
+ except ValueError:
return None
else:
+ # The node is in the bucket
+ n = self.buckets[i].l[it]
tstamp = n.lastSeen
n.updateLastSeen()
+
+ # Move the node to the end and touch the bucket
+ del(self.buckets[i].l[it])
+ self.buckets[i].l.append(n)
+ self.buckets[i].touch()
+
return tstamp
def invalidateNode(self, n):
def nodeFailed(self, node):
"""Mark a node as having failed once, and remove it if it has failed too much."""
+ # Get the bucket number
+ num = self._nodeNum(node)
+ i = self._bucketIndexForInt(num)
+
+ # Check to see if node is in the bucket
try:
- n = self.findNodes(node.num)[0]
- except IndexError:
+ it = self.buckets[i].l.index(num)
+ except ValueError:
return None
else:
+ # The node is in the bucket
+ n = self.buckets[i].l[it]
if n.msgFailed() >= self.config['MAX_FAILURES']:
self.invalidateNode(n)
"""Update the L{lastAccessed} time."""
self.lastAccessed = datetime.now()
+ def sort(self):
+ """Sort the nodes in the bucket by their lastSeen time."""
+ def _sort(a, b):
+ """Sort nodes by their lastSeen time."""
+ if a.lastSeen > b.lastSeen:
+ return 1
+ elif a.lastSeen < b.lastSeen:
+ return -1
+ return 0
+ self.l.sort(_sort)
+
def getNodeWithInt(self, num):
"""Get the node in the bucket with that number.
else: raise ValueError
def __repr__(self):
- return "<KBucket %d items (%d to %d)>" % (len(self.l), self.min, self.max)
+ return "<KBucket %d items (%f to %f, range %d)>" % (
+ len(self.l), loge(self.min+1)/loge(2), loge(self.max)/loge(2), loge(self.max-self.min)/loge(2))
#{ Comparators to bisect/index a list of buckets (by their range) with either a node or a long
def __lt__(self, a):
self.t.invalidateNode(self.b)
self.failUnlessEqual(len(self.t.buckets[0].l), 0)
+ def testMergeBuckets(self):
+ for i in xrange(1000):
+ b = Node(khash.newID(), '127.0.0.1', 2003 + i)
+ self.t.insertNode(b)
+ num = len(self.t.buckets)
+ i = self.t._bucketIndexForInt(self.a.num)
+ for b in self.t.buckets[i].l[:]:
+ self.t.invalidateNode(b)
+ self.failUnlessEqual(len(self.t.buckets), num-1)
+
def testFail(self):
self.testAddNode()
for i in range(self.t.config['MAX_FAILURES'] - 1):
projects / quix0rs-apt-p2p.git / blobdiff