From ec406ad66c81305a502e18b55958655c5999d820 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 7 Jan 2017 15:49:17 +0200 Subject: [PATCH] test --- basilisk/basilisk.c | 13 ++++++------- iguana/dpow/dpow_rpc.c | 2 +- iguana/iguana_notary.c | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index bf552c280..dfef0135f 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -868,7 +868,7 @@ int32_t basilisk_issued_purge(struct supernet_info *myinfo,int32_t timepad) void basilisks_loop(void *arg) { static uint32_t counter; - struct iguana_info *relay; struct supernet_info *myinfo = arg; int32_t i,iter; double startmilli,endmilli; //struct dpow_info *dp; + struct iguana_info *relay; struct supernet_info *myinfo = arg; int32_t i,iter; double startmilli,endmilli; struct dpow_info *dp; iter = 0; relay = iguana_coinfind("RELAY"); printf("start basilisk loop\n"); @@ -877,6 +877,7 @@ void basilisks_loop(void *arg) if ( relay == 0 ) relay = iguana_coinfind("RELAY"); startmilli = OS_milliseconds(); + endmilli = startmilli + 1000; basilisk_issued_purge(myinfo,600000); basilisk_p2pQ_process(myinfo,777); if ( myinfo->IAMNOTARY != 0 ) @@ -887,17 +888,15 @@ void basilisks_loop(void *arg) if ( myinfo->numdpows == 1 ) { iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]); - endmilli = startmilli + 50; + endmilli = startmilli + 2500; } else if ( myinfo->numdpows > 1 ) { - /*dp = &myinfo->DPOWS[counter % myinfo->numdpows]; + dp = &myinfo->DPOWS[counter % myinfo->numdpows]; iguana_dPoWupdate(myinfo,dp); if ( (counter % myinfo->numdpows) != 0 ) - iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]);*/ - for (i=0; inumdpows; i++) - iguana_dPoWupdate(myinfo,&myinfo->DPOWS[i]); - endmilli = startmilli + 300; + iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]); + endmilli = startmilli + 100; } } else diff --git a/iguana/dpow/dpow_rpc.c b/iguana/dpow/dpow_rpc.c index 8509397b5..87cee802a 100755 --- a/iguana/dpow/dpow_rpc.c +++ b/iguana/dpow/dpow_rpc.c @@ -1039,7 +1039,7 @@ int32_t dpow_issuer_iteration(struct dpow_info *dp,struct iguana_info *coin,int3 else { //printf("error from %s\n",coin->symbol); - sleep(3); + usleep(100000); } return(height); } diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index a7945910c..54e55d184 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -151,7 +151,7 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp) } src = iguana_coinfind(dp->symbol); dest = iguana_coinfind(dp->dest); - fprintf(stderr,"i.%d dp.%p dPoWupdate (%s -> %s)\n",i,dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); + //fprintf(stderr,"i.%d dp.%p dPoWupdate (%s -> %s)\n",i,dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); if ( src != 0 && dest != 0 ) { dp->numdesttx = sizeof(dp->desttx)/sizeof(*dp->desttx); @@ -172,7 +172,7 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp) { fprintf(stderr,"[I"); dp->SRCHEIGHT = dpow_issuer_iteration(dp,src,dp->SRCHEIGHT,&dp->SRCREALTIME); - fprintf(stderr,"] "); + fprintf(stderr," %d] ",dp->SRCHEIGHT); } char str[65]; printf("[%s] %s %s height.%d vs last.%d\n",dp->dest,dp->symbol,bits256_str(str,blockhash),height,dp->last.blockhash.height); if ( dp->lastheight == 0 )