lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

test

release/v0.1
jl777 9 years ago
parent
3c1d3668b6
commit
5515219af0
2 changed files with 10 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      iguana/iguana_bundles.c
  2. 2
      iguana/iguana_recv.c

16
iguana/iguana_bundles.c
View File

@ -466,10 +466,10 @@ int32_t sortds(double *buf,uint32_t num,int32_t size)
void iguana_bundlestats(struct iguana_info *coin,char *str) void iguana_bundlestats(struct iguana_info *coin,char *str)
{ {
int32_t i,n,dispflag,numrecv,numhashes,numcached,numsaved,numemit; int64_t estsize = 0; int32_t i,n,dispflag,numrecv,done,numhashes,numcached,numsaved,numemit; int64_t estsize = 0;
struct iguana_bundle *bp; struct iguana_bundle *bp;
dispflag = (rand() % 1000) == 0; dispflag = (rand() % 1000) == 0;
numrecv = numhashes = numcached = numsaved = numemit = 0; numrecv = numhashes = numcached = numsaved = numemit = done = 0;
memset(coin->rankedbps,0,sizeof(coin->rankedbps)); memset(coin->rankedbps,0,sizeof(coin->rankedbps));
for (i=n=0; i<coin->bundlescount; i++) for (i=n=0; i<coin->bundlescount; i++)
{ {
@ -483,7 +483,9 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
numsaved += bp->numsaved; numsaved += bp->numsaved;
if ( bp->emitfinish != 0 ) if ( bp->emitfinish != 0 )
{ {
numemit++; done++;
if ( bp->emitfinish > 1 )
numemit++;
iguana_bundlepurge(coin,bp); iguana_bundlepurge(coin,bp);
} }
else if ( bp->metric > 0. ) else if ( bp->metric > 0. )
@ -507,7 +509,7 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
// origissue = 8; // origissue = 8;
issue = origissue; issue = origissue;
now = (uint32_t)time(NULL); now = (uint32_t)time(NULL);
for (i=0; i<n&&i<100; i++) for (i=0; i<n; i++)
{ {
if ( issue <= 0 ) if ( issue <= 0 )
break; break;
@ -520,10 +522,10 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
//printf("j.%d bp.%d %d %x lag.%d\n",j,bp->minrequests,block->numrequests,block->fpipbits,now - bp->issued[j]); //printf("j.%d bp.%d %d %x lag.%d\n",j,bp->minrequests,block->numrequests,block->fpipbits,now - bp->issued[j]);
if ( block->numrequests <= bp->minrequests && block->fpipbits == 0 && (bp->issued[j] == 0 || now > bp->issued[j]+60) ) if ( block->numrequests <= bp->minrequests && block->fpipbits == 0 && (bp->issued[j] == 0 || now > bp->issued[j]+60) )
{ {
printf("%d:%d.%d ",bp->hdrsi,j,block->numrequests); //printf("%d:%d.%d ",bp->hdrsi,j,block->numrequests);
flag++; flag++;
bp->issued[j] = now; bp->issued[j] = now;
iguana_blockQ(coin,bp,j,bp->hashes[j],1); iguana_blockQ(coin,bp,j,bp->hashes[j],0);
if ( --issue < 0 ) if ( --issue < 0 )
break; break;
} }
@ -548,7 +550,7 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
tmp = (difft.millis * 1000000); tmp = (difft.millis * 1000000);
tmp %= 1000000000; tmp %= 1000000000;
difft.millis = ((double)tmp / 1000000.); difft.millis = ((double)tmp / 1000000.);
sprintf(str,"N[%d] h.%d r.%d c.%d:%d:%d s.%d E.%d:%d M.%d L.%d est.%d %s %d:%02d:%02d %03.3f peers.%d/%d",coin->bundlescount,numhashes,coin->blocksrecv,coin->numcached,numcached,coin->cachefreed,numsaved,numemit,coin->numreqsent,coin->blocks.hwmchain.height,coin->longestchain,coin->MAXBUNDLES,mbstr(str2,estsize),(int32_t)difft.x/3600,(int32_t)(difft.x/60)%60,(int32_t)difft.x%60,difft.millis,p,coin->MAXPEERS); sprintf(str,"N[%d] h.%d r.%d c.%d:%d:%d s.%d d.%d E.%d:%d M.%d L.%d est.%d %s %d:%02d:%02d %03.3f peers.%d/%d",coin->bundlescount,numhashes,coin->blocksrecv,coin->numcached,numcached,coin->cachefreed,numsaved,done,numemit,coin->numreqsent,coin->blocks.hwmchain.height,coin->longestchain,coin->MAXBUNDLES,mbstr(str2,estsize),(int32_t)difft.x/3600,(int32_t)(difft.x/60)%60,(int32_t)difft.x%60,difft.millis,p,coin->MAXPEERS);
//sprintf(str+strlen(str),"%s.%-2d %s time %.2f files.%d Q.%d %d\n",coin->symbol,flag,str,(double)(time(NULL)-coin->starttime)/60.,coin->peers.numfiles,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ)); //sprintf(str+strlen(str),"%s.%-2d %s time %.2f files.%d Q.%d %d\n",coin->symbol,flag,str,(double)(time(NULL)-coin->starttime)/60.,coin->peers.numfiles,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ));
//if ( (rand() % 100) == 0 ) //if ( (rand() % 100) == 0 )
static uint32_t lastdisp; static uint32_t lastdisp;

2
iguana/iguana_recv.c
View File

@ -703,7 +703,7 @@ int32_t iguana_pollQsPT(struct iguana_info *coin,struct iguana_peer *addr)
iguana_send(coin,addr,serialized,datalen); iguana_send(coin,addr,serialized,datalen);
addr->pendhdrs++; addr->pendhdrs++;
flag++; flag++;
} else printf("skip hdrreq.%d numhashes.%d\n",bp->bundleheight,bp->numhashes); } // else printf("skip hdrreq.%d numhashes.%d\n",bp->bundleheight,bp->numhashes);
} }
free_queueitem(hashstr); free_queueitem(hashstr);
return(flag); return(flag);

Write Preview
Loading…
Cancel
Save