From a8d25261166bb2eec18fdf6e99725ff4c11175e9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 12 Mar 2016 14:59:09 -0300 Subject: [PATCH] test --- iguana/iguana777.h | 4 ++-- iguana/iguana_recv.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 2c5b7877d..bacfe98f2 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -37,8 +37,8 @@ typedef int32_t (*blockhashfunc)(uint8_t *blockhashp,uint8_t *serialized,int32_t #define IGUANA_HEADPERCENTAGE 0. #define IGUANA_TAILPERCENTAGE 1.0 #define IGUANA_MAXPENDHDRS 1 -#define _IGUANA_MAXPENDING 77 -#define IGUANA_MAXPENDBUNDLES 8 +#define _IGUANA_MAXPENDING 8 +#define IGUANA_MAXPENDBUNDLES 64 #define IGUANA_BUNDLELOOP 3 #define IGUANA_RPCPORT 7778 #define IGUANA_MAXRAMCHAINSIZE ((uint64_t)1024L * 1024L * 1024L * 16) diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index 52bb351d5..1f0b412ee 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -53,7 +53,7 @@ int32_t iguana_sendblockreqPT(struct iguana_info *coin,struct iguana_peer *addr, coin->numreqsent++; addr->pendblocks++; addr->pendtime = (uint32_t)time(NULL); - printf("REQ.%s bundlei.%d hdrsi.%d\n",bits256_str(hexstr,hash2),bundlei,bp!=0?bp->hdrsi:-1); + //printf("REQ.%s bundlei.%d hdrsi.%d\n",bits256_str(hexstr,hash2),bundlei,bp!=0?bp->hdrsi:-1); } else printf("MSG_BLOCK null datalen.%d\n",len); return(len); } @@ -357,7 +357,8 @@ uint32_t iguana_allhashcmp(struct iguana_info *coin,struct iguana_bundle *bp,bit prev->hh.next = block; block->hh.prev = prev; } - //iguana_blockQ(coin,bp,i,blockhashes[i],0); + if ( bp->hdrsi < coin->MAXBUNDLES ) + iguana_blockQ(coin,bp,i,blockhashes[i],0); } else printf("no allhashes block.%p or mismatch.%p\n",block,bp->blocks[i]); prev = block; } @@ -456,7 +457,7 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct iguana_bundle *bp,int } } max = 1 + ((coin->MAXPENDING*coin->MAXPEERS - pend) >> 1); - endmillis = OS_milliseconds() + timelimit*10; + endmillis = OS_milliseconds() + timelimit; while ( bp->emitfinish == 0 && OS_milliseconds() < endmillis ) { now = (uint32_t)time(NULL); @@ -489,7 +490,7 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct iguana_bundle *bp,int usleep(10000); } width = 1000 + sqrt(sqrt(bp->n * (1+bp->numsaved+issued)) * (10+coin->bundlescount-bp->hdrsi)); - if ( 0 && counter > 0 )//&& bp->rank <= coin->peers.numranked ) + //if ( 0 && counter > 0 )//&& bp->rank <= coin->peers.numranked ) printf("ITERATE.%d bundle.%d h.%d n.%d r.%d s.%d F.%d I.%d T.%d %f %u next %f counter.%d\n",bp->rank,bp->bundleheight/coin->chain->bundlesize,bp->numhashes,bp->n,bp->numrecv,bp->numsaved,bp->emitfinish,issued,timelimit,endmillis-OS_milliseconds(),(uint32_t)time(NULL),width,counter); if ( bp->emitfinish == 0 ) {