From: Forrest Voight Date: Sat, 27 Oct 2012 04:10:10 +0000 (-0400) Subject: moving forgetting about old shares into node X-Git-Tag: 9.0~31 X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=50c7e919c05d4a30a18bcff0acf1cb32e9fb3ada moving forgetting about old shares into node --- diff --git a/p2pool/data.py b/p2pool/data.py index e24e90b..7238f6e 100644 --- a/p2pool/data.py +++ b/p2pool/data.py @@ -704,54 +704,6 @@ class OkayTracker(forest.Tracker): print ' ', format_hash(head_hash), format_hash(self.items[head_hash].previous_hash), score best_head_score, best = decorated_heads[-1] if decorated_heads else (None, None) - # eat away at heads - if decorated_heads: - for i in xrange(1000): - to_remove = set() - for share_hash, tail in self.heads.iteritems(): - if share_hash in [head_hash for score, head_hash in decorated_heads[-5:]]: - #print 1 - continue - if self.items[share_hash].time_seen > time.time() - 300: - #print 2 - continue - if share_hash not in self.verified.items and max(self.items[after_tail_hash].time_seen for after_tail_hash in self.reverse.get(tail)) > time.time() - 120: # XXX stupid - #print 3 - continue - to_remove.add(share_hash) - if not to_remove: - break - for share_hash in to_remove: - if share_hash in self.verified.items: - self.verified.remove(share_hash) - self.remove(share_hash) - #print "_________", to_remove - - # drop tails - for i in xrange(1000): - to_remove = set() - for tail, heads in self.tails.iteritems(): - if min(self.get_height(head) for head in heads) < 2*self.net.CHAIN_LENGTH + 10: - continue - for aftertail in self.reverse.get(tail, set()): - if len(self.reverse[self.items[aftertail].previous_hash]) > 1: # XXX - print "raw" - continue - to_remove.add(aftertail) - if not to_remove: - break - # if removed from this, it must be removed from verified - #start = time.time() - for aftertail in to_remove: - if self.items[aftertail].previous_hash not in self.tails: - print "erk", aftertail, self.items[aftertail].previous_hash - continue - if aftertail in self.verified.items: - self.verified.remove(aftertail) - self.remove(aftertail) - #end = time.time() - #print "removed! %i %f" % (len(to_remove), (end - start)/len(to_remove)) - if best is not None: best_share = self.items[best] if (best_share.header['previous_block'], best_share.header['bits']) != (previous_block, bits) and best_share.header_hash != previous_block and best_share.peer is not None: @@ -779,7 +731,7 @@ class OkayTracker(forest.Tracker): for peer, hash, ts, targ in desired: print ' ', '%s:%i' % peer.addr if peer is not None else None, format_hash(hash), math.format_dt(time.time() - ts), bitcoin_data.target_to_difficulty(targ), ts >= timestamp_cutoff, targ <= target_cutoff - return best, [(peer, hash) for peer, hash, ts, targ in desired if ts >= timestamp_cutoff] + return best, [(peer, hash) for peer, hash, ts, targ in desired if ts >= timestamp_cutoff], decorated_heads def score(self, share_hash, block_rel_height_func): # returns approximate lower bound on chain's hashrate in the last self.net.CHAIN_LENGTH*15//16*self.net.SHARE_PERIOD time diff --git a/p2pool/node.py b/p2pool/node.py index 7c5c83c..2d1d807 100644 --- a/p2pool/node.py +++ b/p2pool/node.py @@ -1,5 +1,6 @@ import random import sys +import time from twisted.internet import defer, reactor, task from twisted.python import log @@ -272,12 +273,65 @@ class Node(object): new_known_txs[tx_hash] = self.known_txs_var.value[tx_hash] self.known_txs_var.set(new_known_txs) task.LoopingCall(forget_old_txs).start(10) + + task.LoopingCall(self.clean_tracker).start(5) def set_best_share(self): - best, desired = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value) + best, desired, decorated_heads = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value) self.best_share_var.set(best) self.desired_var.set(desired) def get_current_txouts(self): return p2pool_data.get_expected_payouts(self.tracker, self.best_share_var.value, self.bitcoind_work.value['bits'].target, self.bitcoind_work.value['subsidy'], self.net) + + def clean_tracker(self): + best, desired, decorated_heads = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value) + + # eat away at heads + if decorated_heads: + for i in xrange(1000): + to_remove = set() + for share_hash, tail in self.tracker.heads.iteritems(): + if share_hash in [head_hash for score, head_hash in decorated_heads[-5:]]: + #print 1 + continue + if self.tracker.items[share_hash].time_seen > time.time() - 300: + #print 2 + continue + if share_hash not in self.tracker.verified.items and max(self.tracker.items[after_tail_hash].time_seen for after_tail_hash in self.tracker.reverse.get(tail)) > time.time() - 120: # XXX stupid + #print 3 + continue + to_remove.add(share_hash) + if not to_remove: + break + for share_hash in to_remove: + if share_hash in self.tracker.verified.items: + self.tracker.verified.remove(share_hash) + self.tracker.remove(share_hash) + #print "_________", to_remove + + # drop tails + for i in xrange(1000): + to_remove = set() + for tail, heads in self.tracker.tails.iteritems(): + if min(self.tracker.get_height(head) for head in heads) < 2*self.tracker.net.CHAIN_LENGTH + 10: + continue + for aftertail in self.tracker.reverse.get(tail, set()): + if len(self.tracker.reverse[self.tracker.items[aftertail].previous_hash]) > 1: # XXX + print "raw" + continue + to_remove.add(aftertail) + if not to_remove: + break + # if removed from this, it must be removed from verified + #start = time.time() + for aftertail in to_remove: + if self.tracker.items[aftertail].previous_hash not in self.tracker.tails: + print "erk", aftertail, self.tracker.items[aftertail].previous_hash + continue + if aftertail in self.tracker.verified.items: + self.tracker.verified.remove(aftertail) + self.tracker.remove(aftertail) + #end = time.time() + #print "removed! %i %f" % (len(to_remove), (end - start)/len(to_remove))