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
84061b225f
commit
2a64168571
1 changed files with 40 additions and 31 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. 71
      iguana/iguana_bundles.c

71
iguana/iguana_bundles.c
View File

@ -366,7 +366,7 @@ void iguana_bundlepurge(struct iguana_info *coin,struct iguana_bundle *bp)
int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int32_t max,int32_t timelimit) int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int32_t max,int32_t timelimit)
{ {
int32_t i,j,k,len,starti,lag,doneval,maxval,numpeers,laggard,flag=0,finished,peercounts[IGUANA_MAXPEERS],donecounts[IGUANA_MAXPEERS],counter = 0; int32_t i,j,k,len,starti,lag,doneval,nonz,total=0,maxval,numpeers,laggard,flag=0,finished,peercounts[IGUANA_MAXPEERS],donecounts[IGUANA_MAXPEERS],counter = 0;
struct iguana_peer *addr; uint32_t now; struct iguana_block *block; struct iguana_peer *addr; uint32_t now; struct iguana_block *block;
bits256 hashes[50]; uint8_t serialized[sizeof(hashes) + 256]; bits256 hashes[50]; uint8_t serialized[sizeof(hashes) + 256];
if ( bp == 0 ) if ( bp == 0 )
@ -421,7 +421,8 @@ int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int
} }
else if ( block->peerid > 0 ) else if ( block->peerid > 0 )
{ {
if ( block->fpipbits != 0 && block->fpos >= 0 ) total++;
if ( block->fpipbits != 0 )//&& block->fpos >= 0 )
{ {
donecounts[block->peerid - 1]++; donecounts[block->peerid - 1]++;
if ( donecounts[block->peerid - 1] > doneval ) if ( donecounts[block->peerid - 1] > doneval )
@ -455,39 +456,47 @@ int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int
//printf("doneval.%d maxval.%d\n",doneval,maxval); //printf("doneval.%d maxval.%d\n",doneval,maxval);
if ( bp == coin->current ) if ( bp == coin->current )
{ {
for (i=laggard=finished=0; i<numpeers; i++) double threshold;
{ for (i=nonz=0; i<numpeers; i++)
if ( peercounts[i] > 10 ) if ( donecounts[i]+peercounts[i] != 0 )
laggard++; nonz++;
if ( peercounts[i] == 0 && donecounts[i] > 10 ) if ( nonz != 0 && total != 0 )
finished++;
}
if ( finished > laggard*10 && numpeers > 2*laggard && laggard > 0 )
{ {
threshold = ((double)total / nonz) - 1.;
for (i=laggard=finished=0; i<numpeers; i++) for (i=laggard=finished=0; i<numpeers; i++)
{ {
if ( peercounts[i] > 10 && (addr= coin->peers.ranked[i]) != 0 && now > bp->currenttime+lag ) if ( peercounts[i] > threshold )
laggard++;
if ( peercounts[i] == 0 && donecounts[i] > threshold )
finished++;
}
if ( finished > laggard*10 && numpeers > 2*laggard && laggard > 0 )
{
for (i=laggard=finished=0; i<numpeers; i++)
{ {
if ( numpeers > 64 || addr->laggard++ > 3 ) if ( peercounts[i] > threshold && (addr= coin->peers.ranked[i]) != 0 && now > bp->currenttime+lag )
addr->dead = (uint32_t)time(NULL);
for (j=0; j<bp->n; j++)
{ {
if ( (block= bp->blocks[j]) != 0 && block->peerid == i && block->fpipbits == 0 ) if ( numpeers > 64 || addr->laggard++ > 3 )
addr->dead = (uint32_t)time(NULL);
for (j=0; j<bp->n; j++)
{ {
printf("%d ",j); if ( (block= bp->blocks[j]) != 0 && block->peerid == i && block->fpipbits == 0 )
flag++; {
counter++; printf("%d ",j);
block->peerid = 0; flag++;
iguana_blockQ("kick",coin,bp,j,block->RO.hash2,now > block->issued+lag*10); counter++;
bp->issued[i] = block->issued = now; block->peerid = 0;
iguana_blockQ("kick",coin,bp,j,block->RO.hash2,1);
bp->issued[i] = block->issued = now;
}
} }
printf("kill peer.%d %s reissued\n",i,addr->ipaddr);
} }
printf("kill peer.%d %s reissued\n",i,addr->ipaddr);
} }
for (i=0; i<numpeers; i++)
printf("%d ",peercounts[i]);
printf("peercounts: finished %d, laggards.%d threshold %f\n",finished,laggard,threshold);
} }
for (i=0; i<numpeers; i++)
printf("%d ",peercounts[i]);
printf("peercounts, 90%% finished %d, laggards.%d\n",finished,laggard);
} }
} }
for (i=0; i<bp->n; i++) for (i=0; i<bp->n; i++)
@ -496,14 +505,14 @@ int32_t iguana_bundleissue(struct iguana_info *coin,struct iguana_bundle *bp,int
{ {
if ( now > block->issued+lag ) if ( now > block->issued+lag )
{ {
counter++;
if ( bp == coin->current ) if ( bp == coin->current )
{ {
counter++; if ( bp == coin->current && (addr= coin->peers.ranked[rand() % numpeers]) != 0 )
iguana_blockQ("kick",coin,bp,i,block->RO.hash2,now > block->issued+lag*10); iguana_sendblockreqPT(coin,addr,bp,i,block->RO.hash2,0);
//if ( bp == coin->current && (addr= coin->peers.ranked[rand() % numpeers]) != 0 )
// iguana_sendblockreqPT(coin,addr,bp,i,block->RO.hash2,0);
printf("[%d:%d] ",bp->hdrsi,i); printf("[%d:%d] ",bp->hdrsi,i);
} else iguana_blockQ("kick",coin,bp,i,block->RO.hash2,0); }
iguana_blockQ("kick",coin,bp,i,block->RO.hash2,0);
flag++; flag++;
} //else printf("%d ",now - block->issued); } //else printf("%d ",now - block->issued);
} }
@ -691,7 +700,7 @@ int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp)
int32_t iguana_bundleiters(struct iguana_info *coin,struct iguana_bundle *bp,int32_t timelimit) int32_t iguana_bundleiters(struct iguana_info *coin,struct iguana_bundle *bp,int32_t timelimit)
{ {
int32_t range,starti,lasti,retval=0,max,counter = 0; double endmillis; struct iguana_bundle *currentbp,*lastbp; int32_t range,starti,lasti,retval=0,max,counter = 0; struct iguana_bundle *currentbp,*lastbp;
if ( (range= coin->peers.numranked) > coin->MAXBUNDLES ) if ( (range= coin->peers.numranked) > coin->MAXBUNDLES )
range = coin->MAXBUNDLES; range = coin->MAXBUNDLES;
currentbp = coin->current; currentbp = coin->current;

Write Preview
Loading…
Cancel
Save