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
15ff8d17ff
commit
979813418f
2 changed files with 9 additions and 6 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. 1
      iguana/iguana777.c
  2. 14
      iguana/iguana_recv.c

1
iguana/iguana777.c
View File

@ -250,6 +250,7 @@ void iguana_mergeQ(struct iguana_info *coin,struct iguana_bundle *bp,struct igua
void iguana_bundleQ(struct iguana_info *coin,struct iguana_bundle *bp,int32_t timelimit) void iguana_bundleQ(struct iguana_info *coin,struct iguana_bundle *bp,int32_t timelimit)
{ {
struct iguana_helper *ptr; struct iguana_helper *ptr;
bp->queued = (uint32_t)time(NULL);
ptr = mycalloc('i',1,sizeof(*ptr)); ptr = mycalloc('i',1,sizeof(*ptr));
ptr->allocsize = sizeof(*ptr); ptr->allocsize = sizeof(*ptr);
ptr->coin = coin; ptr->coin = coin;

14
iguana/iguana_recv.c
View File

@ -309,7 +309,6 @@ uint32_t iguana_allhashcmp(struct iguana_info *coin,struct iguana_bundle *bp,bit
// iguana_blockQ(coin,bp,i,block->RO.hash2,1), n++; // iguana_blockQ(coin,bp,i,block->RO.hash2,1), n++;
} }
//printf("ALLHASHES FOUND! %d requested.%d\n",bp->bundleheight,n); //printf("ALLHASHES FOUND! %d requested.%d\n",bp->bundleheight,n);
bp->queued = (uint32_t)time(NULL);
iguana_bundleQ(coin,bp,500 + (rand() % 500)); iguana_bundleQ(coin,bp,500 + (rand() % 500));
return(bp->queued); return(bp->queued);
} }
@ -381,7 +380,7 @@ struct iguana_bundle *iguana_bundleset(struct iguana_info *coin,struct iguana_bl
struct iguana_bundlereq *iguana_recvblockhdrs(struct iguana_info *coin,struct iguana_bundlereq *req,struct iguana_block *blocks,int32_t n,int32_t *newhwmp) struct iguana_bundlereq *iguana_recvblockhdrs(struct iguana_info *coin,struct iguana_bundlereq *req,struct iguana_block *blocks,int32_t n,int32_t *newhwmp)
{ {
int32_t i,bundlei; struct iguana_block *block; struct iguana_bundle *bp; int32_t i,bundlei,match; struct iguana_block *block; struct iguana_bundle *bp,*firstbp = 0;
if ( blocks == 0 ) if ( blocks == 0 )
{ {
printf("iguana_recvblockhdrs null blocks?\n"); printf("iguana_recvblockhdrs null blocks?\n");
@ -389,16 +388,19 @@ struct iguana_bundlereq *iguana_recvblockhdrs(struct iguana_info *coin,struct ig
} }
if ( blocks != 0 && n > 0 ) if ( blocks != 0 && n > 0 )
{ {
for (i=0; i<n; i++) for (i=match=0; i<n; i++)
{ {
//fprintf(stderr,"i.%d of %d bundleset\n",i,n); //fprintf(stderr,"i.%d of %d bundleset\n",i,n);
if ( (bp= iguana_bundleset(coin,&block,&bundlei,&blocks[i])) != 0 && bp->hdrsi < IGUANA_MAXACTIVEBUNDLES ) if ( (bp= iguana_bundleset(coin,&block,&bundlei,&blocks[i])) != 0 )
{ {
//iguana_blockQ(coin,bp,bundlei,blocks[i].RO.hash2,1);
if ( i == 0 ) if ( i == 0 )
printf("GOT HDRS[%d] Q.(%d %d) ht.%d hashes.%d recv.%d\n",n,queue_size(&coin->priorityQ),queue_size(&coin->blocksQ),bp->bundleheight,bp->numhashes,bp->numrecv); firstbp = bp;
if ( bundlei == i && bp == firstbp )
match++;
} }
} }
if ( match == n && n == firstbp->n & firstbp->queued == 0 )
iguana_bundleQ(coin,firstbp,1000 + 10*(rand() % (int32_t)(1+sqrt(bp->bundleheight))));
} }
return(req); return(req);
} }

Write Preview
Loading…
Cancel
Save