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
2029fba831
commit
618079aa1b
2 changed files with 21 additions and 22 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. 39
      iguana/iguana_bundles.c
  2. 2
      iguana/iguana_recv.c

39
iguana/iguana_bundles.c
View File

@ -675,10 +675,11 @@ int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp)
} }
else else
{ {
printf("missing.(%s)\n",fname); char str[65]; printf("missing.(%s) issue.%s\n",fname,bits256_str(str,bp->hashes[bundlei]));
block->RO.recvlen = 0; block->RO.recvlen = 0;
block->fpipbits = 0; block->fpipbits = 0;
block->fpos = -1; block->fpos = -1;
iguana_blockQ("missing",coin,0,-1,block->RO.hash2,1);
} }
} }
//bp->blocks[bundlei] = block; //bp->blocks[bundlei] = block;
@ -697,25 +698,20 @@ int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp)
numcached++; numcached++;
} }
} }
/*else //if ( 0 ) }
{ else if ( bp == coin->current && time(NULL) > bp->issued[bundlei]+10 )
printf("cleared block?\n");
//block->RO.recvlen = 0;
//block->fpipbits = 0;
//block->fpos = -1;
//block->issued = bp->issued[bundlei] = 0;
}*/
} else printf("bundlecalc: mismatched block vs hash [%d:%d]\n",bp->hdrsi,bundlei);
/*else if ( 0 )
{ {
bp->blocks[bundlei] = iguana_blockfind(coin,bp->hashes[bundlei]); iguana_blockQ("missing",coin,0,-1,bp->hashes[bundlei],1);
bp->hashes[bundlei] = bp->blocks[bundlei]->RO.hash2; bp->issued[bundlei] = (uint32_t)time(NULL);
if ( (block= bp->blocks[bundlei]) != 0 ) }
block->fpipbits = block->queued = 0;
}*/
numhashes++; numhashes++;
bp->checkedtmp++; bp->checkedtmp++;
} }
else if ( bp == coin->current && bits256_nonz(bp->hashes[bundlei]) != 0 && time(NULL) > bp->issued[bundlei]+30 )
{
iguana_blockQ("missing",coin,0,-1,bp->hashes[bundlei],0);
bp->issued[bundlei] = (uint32_t)time(NULL);
}
} }
bp->datasize = datasize; bp->datasize = datasize;
bp->numhashes = numhashes; bp->numhashes = numhashes;
@ -763,7 +759,6 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct OS_memspace *mem,stru
} }
if ( coin->current == 0 ) if ( coin->current == 0 )
coin->current = coin->bundles[0]; coin->current = coin->bundles[0];
//if ( (range= coin->peers.numranked) > coin->MAXBUNDLES )
range = coin->MAXBUNDLES; range = coin->MAXBUNDLES;
currentbp = coin->current; currentbp = coin->current;
lastbp = coin->lastpending; lastbp = coin->lastpending;
@ -821,6 +816,10 @@ int32_t iguana_bundleiters(struct iguana_info *coin,struct OS_memspace *mem,stru
counter = iguana_bundleissue(coin,bp,max,timelimit); counter = iguana_bundleissue(coin,bp,max,timelimit);
if ( 1 && counter > 0 && bp->hdrsi == starti ) if ( 1 && counter > 0 && bp->hdrsi == starti )
printf("ITER now.%u spec.%-4d bundle.%-4d h.%-4d r.%-4d s.%-4d F.%d T.%d issued.%d mb.%d/%d\n",(uint32_t)time(NULL),bp->numspec,bp->bundleheight/coin->chain->bundlesize,bp->numhashes,bp->numrecv,bp->numsaved,bp->emitfinish,timelimit,counter,coin->MAXBUNDLES,coin->bundlescount); printf("ITER now.%u spec.%-4d bundle.%-4d h.%-4d r.%-4d s.%-4d F.%d T.%d issued.%d mb.%d/%d\n",(uint32_t)time(NULL),bp->numspec,bp->bundleheight/coin->chain->bundlesize,bp->numhashes,bp->numrecv,bp->numsaved,bp->emitfinish,timelimit,counter,coin->MAXBUNDLES,coin->bundlescount);
if ( bp == coin->current )
{
}
} }
iguana_bundleQ(coin,bp,1000); iguana_bundleQ(coin,bp,1000);
return(retval); return(retval);
@ -933,7 +932,7 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
lastpending = bp; lastpending = bp;
//printf("SET MAXBUNDLES.%d pend.%d\n",bp->hdrsi,pending); //printf("SET MAXBUNDLES.%d pend.%d\n",bp->hdrsi,pending);
} }
if ( firstgap == 0 ) if ( firstgap == 0 && (bp->emitfinish == 0 || bp->n < coin->chain->bundlesize) )
firstgap = bp; firstgap = bp;
if ( bp->emitfinish == 0 ) if ( bp->emitfinish == 0 )
{ {
@ -978,8 +977,8 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
coin->numsaved = numsaved; coin->numsaved = numsaved;
coin->spaceused = spaceused; coin->spaceused = spaceused;
coin->numverified = numv; coin->numverified = numv;
char str4[65]; char str4[65],str5[65];
sprintf(str,"u.%d b.%d v.%d/%d (%d 1st.%d) to %d N[%d] Q.%d h.%d r.%d c.%s s.%d d.%d E.%d:%d M.%d L.%d est.%d %s %d:%02d:%02d %03.3f peers.%d/%d Q.(%d %d)",numutxo,numbalances,numv,coin->pendbalances,firstgap!=0?firstgap->numsaved:0,firstgap!=0?firstgap->hdrsi:0,coin->lastpending!=0?coin->lastpending->hdrsi:0,count,coin->numbundlesQ,numhashes,coin->blocksrecv,mbstr(str4,spaceused),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,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ)); sprintf(str,"u.%d b.%d v.%d/%d (%d 1st.%d) to %d N[%d] Q.%d h.%d r.%d c.%s s.%d d.%d E.%d:%d est.%d %s %d:%02d:%02d %03.3f peers.%d/%d Q.(%d %d) L.%d M.%d %s",numutxo,numbalances,numv,coin->pendbalances,firstgap!=0?firstgap->numsaved:0,firstgap!=0?firstgap->hdrsi:0,coin->lastpending!=0?coin->lastpending->hdrsi:0,count,coin->numbundlesQ,numhashes,coin->blocksrecv,mbstr(str4,spaceused),numsaved,done,numemit,coin->numreqsent,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,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ),coin->longestchain,coin->blocks.hwmchain.height,bits256_str(str5,coin->blocks.hwmchain.RO.hash2));
//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 ( time(NULL) > lastdisp+10 ) if ( time(NULL) > lastdisp+10 )
{ {

2
iguana/iguana_recv.c
View File

@ -256,7 +256,7 @@ void iguana_gotblockM(struct iguana_info *coin,struct iguana_peer *addr,struct i
} }
} }
req->block = txdata->block; req->block = txdata->block;
//printf("recvlen.%d ipbits.%x prev.(%s)\n",req->block.RO.recvlen,req->block.fpipbits,bits256_str(str,txdata->block.RO.prev_block)); printf("recvlen.%d ipbits.%x prev.(%s)\n",req->block.RO.recvlen,req->block.fpipbits,bits256_str(str,txdata->block.RO.prev_block));
req->block.RO.txn_count = req->numtx = txdata->block.RO.txn_count; req->block.RO.txn_count = req->numtx = txdata->block.RO.txn_count;
coin->recvcount++; coin->recvcount++;
coin->recvtime = (uint32_t)time(NULL); coin->recvtime = (uint32_t)time(NULL);

Write Preview
Loading…
Cancel
Save