From fda653a91371dc6f3ca5a5b90ee032ad1a8c51cb Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 3 Nov 2016 12:08:24 -0300 Subject: [PATCH] test --- iguana/iguana_bundles.c | 12 +++++++----- iguana/iguana_recv.c | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c index be66da25f..3d3a47fe8 100755 --- a/iguana/iguana_bundles.c +++ b/iguana/iguana_bundles.c @@ -685,6 +685,7 @@ int32_t iguana_bundleissuemissing(struct supernet_info *myinfo,struct iguana_inf req->bp = bp; req->height = bp->bundleheight + i; req->bundlei = i; + printf("priority.%p\n",req); queue_enqueue("missing",&coin->priorityQ,&req->DL); bp->issued[i] = 1; n++; @@ -749,6 +750,7 @@ int32_t iguana_blast(struct iguana_info *coin,struct iguana_peer *addr) req->bp = bp; req->height = bp->bundleheight + i; req->bundlei = i; + printf("priority.%p\n",req); queue_enqueue("blast",&coin->priorityQ,&req->DL); } } @@ -1035,16 +1037,16 @@ int64_t iguana_bundlecalcs(struct supernet_info *myinfo,struct iguana_info *coin int32_t iguana_bundlefinalize(struct supernet_info *myinfo,struct iguana_info *coin,struct iguana_bundle *bp,struct OS_memspace *mem,struct OS_memspace *memB) { - int32_t i; struct iguana_bundle *tmpbp; struct iguana_blockreq *breq; + int32_t i; struct iguana_bundle *tmpbp; //struct iguana_blockreq *breq; if ( coin->firstRTheight == 0 && iguana_bundleready(myinfo,coin,bp,0) == bp->n ) { printf(">>>>>>>>>>>>>> EMIT.[%3d] %s | 1st.%-3d h.%-3d c.%-3d s.[%3d] maxB.%d NET.(h%d b%d) %u:%02u\n",bp->hdrsi,coin->symbol,coin->current!=0?coin->current->hdrsi:-1,coin->current!=0?coin->current->numhashes:-1,coin->current!=0?coin->current->numcached:-1,coin->current!=0?coin->current->numsaved:-1,coin->MAXBUNDLES,HDRnet,queue_size(&coin->priorityQ),(uint32_t)(time(NULL)-coin->startutc)/60,(uint32_t)(time(NULL)-coin->startutc)%60); - if ( queue_size(&coin->priorityQ) > 10000 ) + /*if ( queue_size(&coin->priorityQ) > 10000 ) { while ( (breq= queue_dequeue(&coin->priorityQ)) != 0 ) myfree(breq,sizeof(*breq)); //printf("cleared priorityQ\n"); - } + }*/ if ( bp->emitfinish != 0 ) { printf("already EMIT for bundle.%d\n",bp->hdrsi); @@ -1560,11 +1562,11 @@ void iguana_bundlestats(struct supernet_info *myinfo,struct iguana_info *coin,ch iguana_setmaxbundles(coin); strcpy(coin->statusstr,str); coin->estsize = estsize; - if ( queue_size(&coin->priorityQ) > 10000 ) + /*if ( queue_size(&coin->priorityQ) > 10000 ) { while ( (breq= queue_dequeue(&coin->priorityQ)) != 0 ) myfree(breq,sizeof(*breq)); //printf("cleared priorityQ\n"); - } + }*/ } diff --git a/iguana/iguana_recv.c b/iguana/iguana_recv.c index f86c985ee..4ea301f4a 100755 --- a/iguana/iguana_recv.c +++ b/iguana/iguana_recv.c @@ -2134,6 +2134,7 @@ int32_t iguana_blockQ(char *argstr,struct iguana_info *coin,struct iguana_bundle //block->numrequests++; block->issued = now; } + printf("%s.%p\n",str,req); queue_enqueue(str,Q,&req->DL); return(1); } else printf("null Q\n");