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
d9e6c2203c
commit
be4886929a
5 changed files with 27 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      iguana/iguana777.c
  2. 6
      iguana/iguana_init.c
  3. 13
      iguana/iguana_peers.c
  4. 36
      iguana/iguana_recv.c
  5. 4
      iguana/main.c

2
iguana/iguana777.c
View File

@ -302,7 +302,7 @@ void iguana_helper(void *arg)
MEMB = mycalloc('b',IGUANA_MAXBUNDLESIZE,sizeof(*MEMB));
while ( 1 )
{
//iguana_jsonQ();
iguana_jsonQ();
flag = 0;
if ( (ptr= queue_dequeue(&helperQ,0)) != 0 )
{

6
iguana/iguana_init.c
View File

@ -236,19 +236,19 @@ void iguana_parseline(struct iguana_info *coin,int32_t iter,FILE *fp)
//printf("parse line.(%s) maxpeers.%d\n",line,coin->MAXPEERS);
if ( iter == 0 )
{
if ( m < coin->MAXPEERS/2 )//&& m < 77.7 )
if ( m < (2*coin->MAXPEERS)/3 )//&& m < 77.7 )
{
if ( m == 0 )
{
addr = &coin->peers.active[m++];
iguana_initpeer(coin,addr,(uint32_t)calc_ipbits("127.0.0.1"));
//printf("call initpeer.(%s)\n",addr->ipaddr);
printf("call initpeer.(%s)\n",addr->ipaddr);
iguana_launch(coin,"connection",iguana_startconnection,addr,IGUANA_CONNTHREAD);
}
#ifndef IGUANA_DISABLEPEERS
addr = &coin->peers.active[m++];
iguana_initpeer(coin,addr,(uint32_t)calc_ipbits(line));
//printf("call initpeer.(%s)\n",addr->ipaddr);
printf("call initpeer.(%s)\n",addr->ipaddr);
iguana_launch(coin,"connection",iguana_startconnection,addr,IGUANA_CONNTHREAD);
#endif
}

13
iguana/iguana_peers.c
View File

@ -453,8 +453,8 @@ int32_t iguana_recv(int32_t usock,uint8_t *recvbuf,int32_t len)
remains -= recvlen;
recvbuf = &recvbuf[recvlen];
} else usleep(10000);
//if ( remains > 0 )
//printf("got %d remains.%d of total.%d\n",recvlen,remains,len);
if ( 0 && remains > 0 )
printf("got %d remains.%d of total.%d\n",recvlen,remains,len);
}
}
return(len);
@ -468,7 +468,7 @@ void iguana_parsebuf(struct iguana_info *coin,struct iguana_peer *addr,struct ig
if ( memcmp(&checkH,H,sizeof(checkH)) == 0 )
{
//if ( strcmp(addr->ipaddr,"127.0.0.1") == 0 )
//printf("%s parse.(%s) len.%d\n",addr->ipaddr,H.command,len);
//printf("%s parse.(%s) len.%d\n",addr->ipaddr,H->command,len);
//printf("addr->dead.%u\n",addr->dead);
if ( strcmp(H->command,"block") == 0 || strcmp(H->command,"tx") == 0 )
{
@ -573,6 +573,7 @@ void iguana_startconnection(void *arg)
addr->addrind = (int32_t)(((long)addr - (long)&coin->peers.active[0]) / sizeof(*addr));
if ( addr->usock >= 0 )
{
printf("%s usock.%d skip connection\n",addr->ipaddr,addr->usock);
return;
}
if ( strcmp(coin->name,addr->coinstr) != 0 )
@ -697,7 +698,7 @@ uint32_t iguana_possible_peer(struct iguana_info *coin,char *ipaddr)
return((uint32_t)time(NULL));
}
#endif
//printf("check possible peer.(%s)\n",ipaddr);
printf("check possible peer.(%s)\n",ipaddr);
for (i=n=0; i<coin->MAXPEERS; i++)
{
if ( strcmp(ipaddr,coin->peers.active[i].ipaddr) == 0 )
@ -900,7 +901,7 @@ int64_t iguana_peerallocated(struct iguana_info *coin,struct iguana_peer *addr)
void iguana_dedicatedloop(struct iguana_info *coin,struct iguana_peer *addr)
{
static uint32_t lastping;
struct pollfd fds; uint8_t *buf; struct iguana_bundlereq *req; //,serialized[64]
struct pollfd fds; uint8_t *buf,serialized[64]; struct iguana_bundlereq *req;
int32_t bufsize,flag,run,timeout = coin->polltimeout == 0 ? 10 : coin->polltimeout;
#ifdef IGUANA_PEERALLOC
int32_t i; int64_t remaining; struct OS_memspace *mem[sizeof(addr->SEROUT)/sizeof(*addr->SEROUT)];
@ -926,7 +927,7 @@ void iguana_dedicatedloop(struct iguana_info *coin,struct iguana_peer *addr)
// iguana_send_supernet(coin,addr,"{\"agent\":\"SuperNET\",\"method\":\"getpeers\"}",0);
sleep(1);
iguana_send_version(coin,addr,coin->myservices);
//iguana_queue_send(coin,addr,0,serialized,"getaddr",0,0,0);
iguana_queue_send(coin,addr,0,serialized,"getaddr",0,0,0);
run = 0;
while ( addr->usock >= 0 && addr->dead == 0 && coin->peers.shuttingdown == 0 )
{

36
iguana/iguana_recv.c
View File

@ -57,7 +57,7 @@ int32_t iguana_sendblockreq(struct iguana_info *coin,struct iguana_peer *addr,st
addr->pendblocks++;
addr->pendtime = (uint32_t)time(NULL);
//iguana_blockrequest(coin,bp,bundlei,hash2,addr->pendtime,iamthreadsafe);
//printf("REQ.%s bundlei.%d hdrsi.%d\n",bits256_str(hexstr,hash2),bundlei,bp!=0?bp->hdrsi:-1);
printf("REQ.%s bundlei.%d hdrsi.%d\n",bits256_str(hexstr,hash2),bundlei,bp!=0?bp->hdrsi:-1);
} else printf("MSG_BLOCK null datalen.%d\n",len);
return(len);
}
@ -304,10 +304,10 @@ int32_t iguana_allhashcmp(struct iguana_info *coin,struct iguana_bundle *bp,bits
{
if ( (err= iguana_bundlehash2add(coin,0,bp,i,blockhashes[i])) < 0 )
return(err);
if ( bp->emitfinish == 0 && (block= bp->blocks[i]) != 0 && (block->queued == 0 && block->fpipbits == 0) && block->numrequests < 3 )
if ( bp->emitfinish == 0 && (block= bp->blocks[i]) != 0 && (block->queued == 0 && block->fpipbits == 0) )//&& block->numrequests < 3 )
iguana_blockQ(coin,bp,i,block->RO.hash2,0), n++;
}
//printf("ALLHASHES FOUND! %d requested.%d\n",bp->bundleheight,n);
printf("ALLHASHES FOUND! %d requested.%d\n",bp->bundleheight,n);
return(i);
}
}
@ -413,14 +413,14 @@ struct iguana_bundlereq *iguana_recvblockhashes(struct iguana_info *coin,struct
n++;
}
}
//printf("got [%d] num.%d matched hashes\n",n,num);
printf("got [%d] num.%d matched hashes\n",n,num);
}
else
{
//char str[65]; printf("blockhashes[%d] %s\n",num,bits256_str(str,blockhashes[1]));
char str[65]; printf("blockhashes[%d] %s\n",num,bits256_str(str,blockhashes[1]));
iguana_blockQ(coin,0,-1,blockhashes[1],1);
}
//iguana_blockQ(coin,0,-1,blockhashes[num-1],1);
iguana_blockQ(coin,0,-1,blockhashes[num-1],1);
/*if ( (block= iguana_blockhashset(coin,-1,blockhashes[1],1)) != 0 && num > 2 )
{
if ( block->rawdata != 0 )
@ -445,7 +445,7 @@ struct iguana_bundlereq *iguana_recvblock(struct iguana_info *coin,struct iguana
{
struct iguana_bundle *prevbp=0,*bp=0; int32_t prevbundlei=-2,bundlei = -2; struct iguana_block *prevblock,*block;
bp = iguana_bundleset(coin,&block,&bundlei,origblock);
//char str[65]; printf("RECV %s [%d:%d] block.%p\n",bits256_str(str,origblock->RO.hash2),bp!=0?bp->hdrsi:-1,bundlei,block);
char str[65]; printf("RECV %s [%d:%d] block.%p\n",bits256_str(str,origblock->RO.hash2),bp!=0?bp->hdrsi:-1,bundlei,block);
iguana_bundlefind(coin,&prevbp,&prevbundlei,origblock->RO.prev_block);
if ( prevbp != 0 && prevbundlei >= 0 && prevbp->blocks[prevbundlei] == 0 && (prevblock= iguana_blockfind(coin,origblock->RO.prev_block)) != 0 )
{
@ -627,7 +627,7 @@ int32_t iguana_blockQ(struct iguana_info *coin,struct iguana_bundle *bp,int32_t
}
char str[65];
bits256_str(str,hash2);
if ( 0 && (bundlei % 250) == 0 )
//if ( 0 && (bundlei % 250) == 0 )
printf("%s %d %s recv.%d numranked.%d qsize.%d\n",str,req->height,str,coin->blocks.recvblocks,coin->peers.numranked,queue_size(Q));
queue_enqueue(str,Q,&req->DL,0);
return(1);
@ -671,7 +671,8 @@ int32_t iguana_pollQsPT(struct iguana_info *coin,struct iguana_peer *addr)
limit = 1;
//if ( addr->pendblocks >= limit )
// printf("%s %d overlimit.%d\n",addr->ipaddr,addr->pendblocks,limit);
if ( 0 && coin->bundlescount > 0 && (req= queue_dequeue(&coin->priorityQ,0)) == 0 )//addr->pendblocks < limit )//&& now > addr->lastpoll )
req = queue_dequeue(&coin->priorityQ,0);
if ( 0 && coin->bundlescount > 0 && req == 0 )//addr->pendblocks < limit )//&& now > addr->lastpoll )
{
if ( 0 )//strcmp("BTC",coin->symbol) != 0 )
{
@ -802,7 +803,7 @@ int32_t iguana_pollQsPT(struct iguana_info *coin,struct iguana_peer *addr)
else
{
char str[65];
if ( 0 && priority != 0 )
//if ( 0 && priority != 0 )
printf(" issue.%s\n",bits256_str(str,hash2));
if ( block != 0 && block->numrequests < 100 )
block->numrequests++;
@ -839,7 +840,7 @@ int32_t iguana_processrecv(struct iguana_info *coin) // single threaded
lflag++;
//else printf("chainlink error for %d\n",coin->blocks.hwmchain.height+1);
}
else if ( 0 )
if ( 1 )
{
double threshold,lag = OS_milliseconds() - coin->backstopmillis;
threshold = (10 + coin->longestchain - coin->blocksrecv);
@ -852,7 +853,7 @@ int32_t iguana_processrecv(struct iguana_info *coin) // single threaded
if ( strcmp(coin->symbol,"BTC") != 0 )
threshold = 400;
else threshold = 1000;
if ( coin->blocks.hwmchain.height+1 < coin->longestchain && (coin->backstop != coin->blocks.hwmchain.height+1 || lag > threshold) )
if ( coin->blocks.hwmchain.height < coin->longestchain )//&& (coin->backstop != coin->blocks.hwmchain.height+1 || lag > threshold) )
{
coin->backstop = coin->blocks.hwmchain.height+1;
hash2 = iguana_blockhash(coin,coin->backstop);
@ -864,16 +865,7 @@ int32_t iguana_processrecv(struct iguana_info *coin) // single threaded
{
coin->backstopmillis = OS_milliseconds();
iguana_blockQ(coin,bp,bundlei,iguana_blockhash(coin,coin->backstop),1);
//iguana_blockrequest(coin,bp,bundlei,hash2,(uint32_t)time(NULL),1);
/*if ( (bp= coin->bundles[(coin->blocks.hwmchain.height+1)/coin->chain->bundlesize]) == 0 || bp->fpos[bundlei] >= 0 )
{
if ( bp != 0 && coin->backstop == coin->blocks.hwmchain.height+1 )
{
iguana_bundleiclear(coin,bp,bundlei);
}
iguana_blockQ(coin,bp,bundlei,next->RO.hash2,1);
}*/
if ( (rand() % 100) == 0 )
//if ( (rand() % 100) == 0 )
printf("MAINCHAIN.%d threshold %.3f %.3f lag %.3f\n",coin->blocks.hwmchain.height+1,threshold,coin->backstopmillis,lag);
}
}

4
iguana/main.c
View File

@ -330,11 +330,11 @@ void iguana_main(void *arg)
//init_InstantDEX();
while ( 1 )
{
//flag = 0;
flag = 0;
//for (i=0; i<sizeof(Coins)/sizeof(*Coins); i++)
// if ( Coins[i] != 0 && Coins[i]->symbol[0] != 0 )
// flag += iguana_processjsonQ(Coins[i]);
flag = iguana_jsonQ();
//flag = iguana_jsonQ();
if ( flag == 0 )
usleep(100000);
}

Write Preview
Loading…
Cancel
Save