From 1fa449be673ac81c8c2f14f866fcbe001682ee35 Mon Sep 17 00:00:00 2001 From: Con Kolivas Date: Fri, 5 Feb 2016 17:59:44 +1100 Subject: [PATCH] Temporary workaround making nodes match current pool behaviour with txn refcount increasing by 2 each time they're accessed --- src/stratifier.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/stratifier.c b/src/stratifier.c index ba667b6c..65c77544 100644 --- a/src/stratifier.c +++ b/src/stratifier.c @@ -1119,21 +1119,26 @@ static void broadcast_ping(sdata_t *sdata); * existing transactions to determine which need to be propagated */ static void add_txn(sdata_t *sdata, txntable_t **txns, const char *hash, const char *data) { + bool found = false; txntable_t *txn; /* Look for transactions we already know about and increment their * refcount if we're still using them. */ ck_rlock(&sdata->workbase_lock); HASH_FIND_STR(sdata->txns, hash, txn); + if (txn) { + txn->refcount++; + found = true; + } ck_runlock(&sdata->workbase_lock); - if (txn) + if (found) return; txn = ckzalloc(sizeof(txntable_t)); memcpy(txn->hash, hash, 65); txn->data = strdup(data); - txn->refcount = 20; + txn->refcount = 10; HASH_ADD_STR(*txns, hash, txn); } @@ -1422,7 +1427,7 @@ static bool rebuild_txns(sdata_t *sdata, workbase_t *wb, json_t *txnhashes) ret = false; goto out_unlock; } - txn->refcount++; + txn->refcount += 2; JSON_CPACK(txn_val, "{ss,ss}", "hash", hash, "data", txn->data); json_array_append_new(txn_array, txn_val); @@ -6322,7 +6327,7 @@ static void add_node_txns(sdata_t *sdata, const json_t *val) /* Set the refcount for node transactions greater than the * upstream pool to ensure we never age them faster than the * pool does. */ - txn->refcount = 100; + txn->refcount = 50; HASH_ADD_STR(sdata->txns, hash, txn); added++; }