From 917ec0f6c9d6d3e8d8ba07abf284912783d28d6d Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 9 Mar 2016 17:05:48 -0300 Subject: [PATCH] test --- iguana/iguana777.c | 2 +- iguana/iguana777.h | 2 +- iguana/iguana_bundles.c | 6 ++++-- iguana/iguana_peers.c | 4 ++-- iguana/iguana_ramchain.c | 4 ++-- iguana/iguana_recv.c | 9 ++++++++- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/iguana/iguana777.c b/iguana/iguana777.c index ba0c7866a..2d73435b8 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -429,7 +429,7 @@ void iguana_coinloop(void *arg) } } if ( flag == 0 ) - usleep((coin->polltimeout+1) * 100); + usleep((coin->polltimeout+1) * 1000); } } diff --git a/iguana/iguana777.h b/iguana/iguana777.h index 57f3df284..ae3a9a670 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -415,7 +415,7 @@ struct iguana_bundle { struct queueitem DL; struct iguana_info *coin; struct iguana_bundle *nextbp; struct iguana_bloom16 bloom; uint32_t rawscriptspace; - uint32_t issuetime,hdrtime,emitfinish,mergefinish,purgetime,queued; + uint32_t issuetime,hdrtime,emitfinish,mergefinish,purgetime,queued,startutxo,utxofinish; int32_t numhashes,numrecv,numsaved,numcached,rank; int32_t minrequests,n,hdrsi,bundleheight,numtxids,numspends,numunspents,numspec; double avetime,threshold,metric; uint64_t datasize,estsize; diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index 816980809..a0f3e67f5 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -448,6 +448,8 @@ void iguana_bundlestats(struct iguana_info *coin,char *str) numsaved += bp->numsaved; if ( bp->emitfinish != 0 ) { + if ( firstgap == 0 ) + bp->startutxo = (uint32_t)time(NULL); done++; if ( bp->emitfinish > 1 ) numemit++; @@ -498,7 +500,7 @@ void iguana_bundlestats(struct iguana_info *coin,char *str) } strcpy(coin->statusstr,str); coin->estsize = estsize; - //if ( firstgap != 0 && firstgap->queued == 0 ) - // iguana_bundleQ(coin,firstgap,1000); + if ( firstgap != 0 && firstgap->queued == 0 ) + iguana_bundleQ(coin,firstgap,1000); } diff --git a/iguana/iguana_peers.c b/iguana/iguana_peers.c index 198b91606..4b1fef05c 100755 --- a/iguana/iguana_peers.c +++ b/iguana/iguana_peers.c @@ -1034,8 +1034,8 @@ void iguana_dedicatedloop(struct iguana_info *coin,struct iguana_peer *addr) usleep(100000); } else if ( addr->rank != 1 ) - usleep(coin->polltimeout*10 + 1*(rand() % (coin->polltimeout*10))); - else usleep(10); + usleep(coin->polltimeout*1000 + 1*(rand() % (coin->polltimeout*1000))); + else usleep(1000); } else run >>= 2; } if ( flag != 0 ) diff --git a/iguana/iguana_ramchain.c b/iguana/iguana_ramchain.c index 6588b4164..5e03140ec 100755 --- a/iguana/iguana_ramchain.c +++ b/iguana/iguana_ramchain.c @@ -1284,7 +1284,7 @@ int64_t iguana_ramchain_init(struct iguana_ramchain *ramchain,struct OS_memspace ramchain->expanded = (expanded != 0); if ( (ramchain->hashmem= hashmem) != 0 ) iguana_memreset(hashmem); - rdata = ramchain->H.data = mem->ptr, offset += sizeof(struct iguana_ramchaindata); + rdata = ramchain->H.data = mem->ptr;//, offset += sizeof(struct iguana_ramchaindata); if ( (rdata->firsti= firsti) != 0 ) { numtxids++, numunspents++, numspends++; @@ -1328,7 +1328,7 @@ int32_t iguana_ramchain_alloc(struct iguana_info *coin,struct iguana_ramchain *r B = 0, Ux = 0, Sx = 0, P = 0, A = 0, X = 0, Kspace = TXbits = PKbits = 0, U = 0, S = 0, T = 0; memset(ramchain,0,sizeof(*ramchain)); ramchain->height = height; - allocsize = _iguana_rdata_action(0,0,0,0,1,numtxids,numunspents,numspends,numpkinds,numexternaltxids,scriptspace,0,0,0,0,0,RAMCHAIN_ARG,numblocks) + sizeof(struct iguana_ramchaindata); + allocsize = _iguana_rdata_action(0,0,0,0,1,numtxids,numunspents,numspends,numpkinds,numexternaltxids,scriptspace,0,0,0,0,0,RAMCHAIN_ARG,numblocks); //printf("T.%d U.%d S.%d P.%d X.%d -> %ld\n",numtxids,numunspents,numspends,numpkinds,numexternaltxids,(long)allocsize); memset(mem,0,sizeof(*mem)); memset(hashmem,0,sizeof(*hashmem)); diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index 3176e4e80..0ce378b75 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -377,7 +377,7 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct iguana_bundle *bp,int iguana_bundleQ(coin,bp,((bp->rank != 0) ? bp->rank : 64) * 100); return(0); } - else //if ( 0 ) + else if ( 0 ) { for (i=0; in; i++) { @@ -468,10 +468,17 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct iguana_bundle *bp,int bp->emitfinish = 1; sleep(1); iguana_emitQ(coin,bp); + iguana_bundleQ(coin,bp,width); return(1); } iguana_bundleQ(coin,bp,width); } + else if ( bp->startutxo == 0 ) + iguana_bundleQ(coin,bp,width); + else if ( bp->utxofinish == 0 ) + { + printf("GENERATE UTXO, verify sigs, etc for ht.%d\n",bp->bundleheight); + } return(0); }