From a85d8781cc20e144eb783ee9da18b3b66e20a12e Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 8 Apr 2016 15:35:29 -0500 Subject: [PATCH] test --- iguana/iguana_bundles.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index ad0798028..2e6bfcb61 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -502,8 +502,10 @@ struct iguana_block *iguana_bundleblock(struct iguana_info *coin,bits256 *hash2p int32_t iguana_bundleissuemissing(struct iguana_info *coin,struct iguana_bundle *bp,int32_t priority,double mult) { - int32_t i,max,nonz,lasti,firsti,lag,num,n=0; uint32_t now; bits256 hash2; double aveduration; struct iguana_peer *addr; - if ( bp->emitfinish != 0 || (priority > 0 && time(NULL) < bp->missingstime+3) || time(NULL) < bp->missingstime+30 ) + int32_t i,max,nonz,starti,lasti,firsti,lag,num,n=0; uint32_t now; bits256 hash2; double aveduration; struct iguana_peer *addr; + starti = coin->current == 0 ? 0 : coin->current->hdrsi; + lasti = coin->lastpending == 0 ? coin->bundlescount-1 : coin->lastpending->hdrsi; + if ( bp->hdrsi < starti || bp->hdrsi > lasti || bp->emitfinish != 0 || ((priority > 0 || bp == coin->current) && time(NULL) < bp->missingstime+3) || time(NULL) < bp->missingstime+30 ) return(0); bp->missingstime = (uint32_t)time(NULL); if ( bp->durationscount != 0 ) @@ -1128,9 +1130,9 @@ void iguana_bundlestats(struct iguana_info *coin,char *str,int32_t lag) coin->spaceused = spaceused; coin->numverified = numv; char str5[65]; int32_t smetric; - if ( firstgap != 0 && firstgap->hdrsi < coin->bundlescount-1 ) // coin->isRT + if ( (bp= firstgap) != 0 && bp->hdrsi < coin->bundlescount-1 ) // coin->isRT { - smetric = (firstgap->hdrsi * 10000) + firstgap->numsaved + firstgap->numhashes + firstgap->numcached; + smetric = (bp->hdrsi * 10000) + bp->numsaved + bp->numhashes + bp->numcached; if ( coin->stuckmonitor != smetric ) { coin->stuckmonitor = smetric; @@ -1141,7 +1143,6 @@ void iguana_bundlestats(struct iguana_info *coin,char *str,int32_t lag) { struct iguana_blockreq *breq; int32_t n,lag; //priority=3, lag = (int32_t)time(NULL) - coin->stucktime; - bp = firstgap; //printf("NONZ stucktime.%u lag.%d iters.%d vs %d metric.%d\n",coin->stucktime,lag,coin->stuckiters,lag/coin->MAXSTUCKTIME,smetric); if ( (lag/coin->MAXSTUCKTIME) > coin->stuckiters ) {