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
d7658ed351
commit
89a1e7104f
3 changed files with 13 additions and 12 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. 2
      iguana/iguana777.c
  2. 4
      iguana/iguana_bundles.c
  3. 19
      iguana/iguana_recv.c

2
iguana/iguana777.c
View File

@ -374,14 +374,12 @@ void iguana_coinloop(void *arg)
coin->chain->minconfirms = coin->minconfirms; coin->chain->minconfirms = coin->minconfirms;
} }
} }
printf("after init loop\n");//, getchar();
coin = coins[0]; coin = coins[0];
iguana_rwiAddrind(coin,0,0,0); iguana_rwiAddrind(coin,0,0,0);
iguana_possible_peer(coin,"127.0.0.1"); iguana_possible_peer(coin,"127.0.0.1");
memset(zero.bytes,0,sizeof(zero)); memset(zero.bytes,0,sizeof(zero));
if ( (bp= iguana_bundlecreate(coin,&bundlei,0,*(bits256 *)coin->chain->genesis_hashdata,zero,1)) != 0 ) if ( (bp= iguana_bundlecreate(coin,&bundlei,0,*(bits256 *)coin->chain->genesis_hashdata,zero,1)) != 0 )
bp->bundleheight = 0; bp->bundleheight = 0;
printf("after bundlecreate\n");//, getchar();
while ( 1 ) while ( 1 )
{ {
//fprintf(stderr,"iter\n"); //fprintf(stderr,"iter\n");

4
iguana/iguana_bundles.c
View File

@ -496,7 +496,7 @@ void iguana_bundlestats(struct iguana_info *coin,char *str)
} }
strcpy(coin->statusstr,str); strcpy(coin->statusstr,str);
coin->estsize = estsize; coin->estsize = estsize;
if ( firstgap != 0 && firstgap->queued == 0 ) //if ( firstgap != 0 && firstgap->queued == 0 )
iguana_bundleQ(coin,firstgap,1000); // iguana_bundleQ(coin,firstgap,1000);
} }

19
iguana/iguana_recv.c
View File

@ -557,7 +557,7 @@ struct iguana_bundlereq *iguana_recvblockhdrs(struct iguana_info *coin,struct ig
if ( firstbp->queued == 0 ) if ( firstbp->queued == 0 )
{ {
//fprintf(stderr,"firstbp blockQ %d\n",firstbp->bundleheight); //fprintf(stderr,"firstbp blockQ %d\n",firstbp->bundleheight);
iguana_bundleQ(coin,firstbp,1000); //iguana_bundleQ(coin,firstbp,1000);
} }
} }
} }
@ -569,7 +569,7 @@ struct iguana_bundlereq *iguana_recvblockhashes(struct iguana_info *coin,struct
int32_t bundlei,i; struct iguana_bundle *bp;// struct iguana_block *block; int32_t bundlei,i; struct iguana_bundle *bp;// struct iguana_block *block;
bp = 0, bundlei = -2; bp = 0, bundlei = -2;
iguana_bundlefind(coin,&bp,&bundlei,blockhashes[1]); iguana_bundlefind(coin,&bp,&bundlei,blockhashes[1]);
// char str[65]; printf("blockhashes[%d] %d of %d %s bp.%d[%d]\n",num,bp==0?-1:bp->hdrsi,coin->bundlescount,bits256_str(str,blockhashes[1]),bp==0?-1:bp->bundleheight,bundlei); char str[65]; printf("blockhashes[%d] %d of %d %s bp.%d[%d]\n",num,bp==0?-1:bp->hdrsi,coin->bundlescount,bits256_str(str,blockhashes[1]),bp==0?-1:bp->bundleheight,bundlei);
if ( bp != 0 ) if ( bp != 0 )
{ {
bp->hdrtime = (uint32_t)time(NULL); bp->hdrtime = (uint32_t)time(NULL);
@ -722,7 +722,7 @@ int32_t iguana_needhdrs(struct iguana_info *coin)
int32_t iguana_reqhdrs(struct iguana_info *coin) int32_t iguana_reqhdrs(struct iguana_info *coin)
{ {
int32_t i,lag,n = 0; struct iguana_bundle *bp; char hashstr[65]; int32_t i,lag,n = 0; struct iguana_bundle *bp; char hashstr[65];
if ( iguana_needhdrs(coin) > 0 && queue_size(&coin->hdrsQ) == 0 ) if ( iguana_needhdrs(coin) > 0 )//&& queue_size(&coin->hdrsQ) == 0 )
{ {
///if ( coin->zcount++ > 1 ) ///if ( coin->zcount++ > 1 )
{ {
@ -737,7 +737,7 @@ int32_t iguana_reqhdrs(struct iguana_info *coin)
// continue; // continue;
if ( bp->numhashes < bp->n && bp->bundleheight+bp->numhashes < coin->longestchain && time(NULL) > bp->issuetime+lag ) if ( bp->numhashes < bp->n && bp->bundleheight+bp->numhashes < coin->longestchain && time(NULL) > bp->issuetime+lag )
{ {
printf("LAG.%ld hdrsi.%d numhashes.%d:%d needhdrs.%d qsize.%d zcount.%d\n",time(NULL)-bp->hdrtime,i,bp->numhashes,bp->n,iguana_needhdrs(coin),queue_size(&coin->hdrsQ),coin->zcount); //printf("LAG.%ld hdrsi.%d numhashes.%d:%d needhdrs.%d qsize.%d zcount.%d\n",time(NULL)-bp->hdrtime,i,bp->numhashes,bp->n,iguana_needhdrs(coin),queue_size(&coin->hdrsQ),coin->zcount);
if ( bp->issuetime == 0 ) if ( bp->issuetime == 0 )
coin->numpendings++; coin->numpendings++;
char str[65]; char str[65];
@ -746,7 +746,10 @@ int32_t iguana_reqhdrs(struct iguana_info *coin)
//printf("%d ",bp->bundleheight); //printf("%d ",bp->bundleheight);
init_hexbytes_noT(hashstr,bp->hashes[0].bytes,sizeof(bits256)); init_hexbytes_noT(hashstr,bp->hashes[0].bytes,sizeof(bits256));
queue_enqueue("hdrsQ",&coin->hdrsQ,queueitem(hashstr),1); queue_enqueue("hdrsQ",&coin->hdrsQ,queueitem(hashstr),1);
//printf("reqHDR.(%s)\n",hashstr);
iguana_blockQ(coin,bp,0,bp->hashes[0],0); iguana_blockQ(coin,bp,0,bp->hashes[0],0);
if ( bits256_nonz(bp->hashes[1]) > 0 )
iguana_blockQ(coin,bp,0,bp->hashes[1],0);
n++; n++;
bp->hdrtime = bp->issuetime = (uint32_t)time(NULL); bp->hdrtime = bp->issuetime = (uint32_t)time(NULL);
} }
@ -838,7 +841,7 @@ int32_t iguana_pollQsPT(struct iguana_info *coin,struct iguana_peer *addr)
bp = 0, bundlei = -2; bp = 0, bundlei = -2;
bp = iguana_bundlefind(coin,&bp,&bundlei,hash2); bp = iguana_bundlefind(coin,&bp,&bundlei,hash2);
z = m = 0; z = m = 0;
if ( bp != 0 && bp->queued == 0 ) if ( bp != 0 )//&& bp->queued == 0 )
{ {
if ( bp->bundleheight+coin->chain->bundlesize < coin->longestchain ) if ( bp->bundleheight+coin->chain->bundlesize < coin->longestchain )
{ {
@ -846,16 +849,16 @@ int32_t iguana_pollQsPT(struct iguana_info *coin,struct iguana_peer *addr)
if ( bp->numhashes < m ) if ( bp->numhashes < m )
z = 1; z = 1;
} }
else if ( bp->numhashes < 3 ) else if ( bp->numhashes < bp->n )
z = 1; z = 1;
} }
if ( bp == 0 || z != 0 ) if ( bp == 0 || z != 0 )
{ {
//printf("%s request HDR.(%s) numhashes.%d\n",addr!=0?addr->ipaddr:"local",hashstr,bp->numhashes); printf("%s request HDR.(%s) numhashes.%d\n",addr!=0?addr->ipaddr:"local",hashstr,bp->numhashes);
iguana_send(coin,addr,serialized,datalen); iguana_send(coin,addr,serialized,datalen);
addr->pendhdrs++; addr->pendhdrs++;
flag++; flag++;
} //else printf("skip hdrreq.%s m.%d z.%d\n",hashstr,m,z); } else printf("skip hdrreq.%s m.%d z.%d bp.%p longest.%d queued.%d\n",hashstr,m,z,bp,bp->coin->longestchain,bp->queued);
} }
//free_queueitem(hashstr); //free_queueitem(hashstr);
//return(flag); //return(flag);

Write Preview
Loading…
Cancel
Save