From d2b729818ca61bc7fc1df94d66c66386632c3400 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 23 Apr 2016 00:12:24 -0500 Subject: [PATCH] test --- iguana/iguana_init.c | 18 +++++++++--------- iguana/iguana_unspents.c | 9 ++++++--- iguana/main.c | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/iguana/iguana_init.c b/iguana/iguana_init.c index c84ed02da..3c1728716 100755 --- a/iguana/iguana_init.c +++ b/iguana/iguana_init.c @@ -480,16 +480,16 @@ struct iguana_info *iguana_coinstart(struct iguana_info *coin,int32_t initialhei printf("error launching accept thread for port.%u\n",coin->chain->portp2p); } } - if ( coin->rpcloop == 0 ) + } + if ( (coin->myservices & 0x80) == 0x80 && coin->rpcloop == 0 ) + { + myinfo->argport = coin->chain->rpcport; + coin->rpcloop = malloc(sizeof(pthread_t)); + if ( OS_thread_create(coin->rpcloop,NULL,(void *)iguana_rpcloop,(void *)myinfo) != 0 ) { - myinfo->argport = coin->chain->rpcport; - coin->rpcloop = malloc(sizeof(pthread_t)); - if ( OS_thread_create(coin->rpcloop,NULL,(void *)iguana_rpcloop,(void *)myinfo) != 0 ) - { - free(coin->rpcloop); - coin->rpcloop = 0; - printf("error launching rpcloop for %s port.%u\n",coin->symbol,coin->chain->rpcport); - } + free(coin->rpcloop); + coin->rpcloop = 0; + printf("error launching rpcloop for %s port.%u\n",coin->symbol,coin->chain->rpcport); } } //coin->firstblock = coin->blocks.parsedblocks + 1; diff --git a/iguana/iguana_unspents.c b/iguana/iguana_unspents.c index bd9b1b03c..c074309ca 100755 --- a/iguana/iguana_unspents.c +++ b/iguana/iguana_unspents.c @@ -884,8 +884,11 @@ uint32_t iguana_fastfindinit(struct iguana_info *coin) if ( (num+1)*16 + tablesize*sizeof(*hashtable) == coin->fastsizes[i] ) { hashtable = (int32_t *)((long)sorted + (1 + num)*16); - coin->fasttables[i] = calloc(tablesize,sizeof(*hashtable)); - memcpy(coin->fasttables[i],hashtable,tablesize * sizeof(*hashtable)); + if ( 0 ) + { + coin->fasttables[i] = calloc(tablesize,sizeof(*hashtable)); + memcpy(coin->fasttables[i],hashtable,tablesize * sizeof(*hashtable)); + } } else { @@ -1434,7 +1437,7 @@ int32_t iguana_spendvectors(struct iguana_info *coin,struct iguana_bundle *bp,st } for (k=0; kcurrent && (spendind % 1000) == 0 ) + if ( bp == coin->current && (spendind % 100) == 0 ) printf("[%-3d:%4d] spendvectors elapsed t.%-3d spendind.%d\n",bp->hdrsi,i,(uint32_t)time(NULL)-starttime,spendind); u = 0; spentbp = 0; diff --git a/iguana/main.c b/iguana/main.c index 09dc129d2..9dd339c22 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -1146,7 +1146,7 @@ void iguana_appletests(struct supernet_info *myinfo) exit(-1); } sleep(1);*/ - if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"prefetchlag\":-1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":500,\"endpend\":500,\"services\":128,\"maxpeers\":64,\"newcoin\":\"BTCD\",\"active\":1,\"numhelpers\":4,\"poll\":1}"),0,myinfo->rpcport)) != 0 ) + if ( 1 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"prefetchlag\":-1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":500,\"endpend\":500,\"services\":128,\"maxpeers\":64,\"newcoin\":\"BTC\",\"active\":1,\"numhelpers\":4,\"poll\":1}"),0,myinfo->rpcport)) != 0 ) { free(str); if ( 0 && (str= SuperNET_JSON(myinfo,cJSON_Parse("{\"userhome\":\"/Users/jimbolaptop/Library/Application Support\",\"agent\":\"iguana\",\"method\":\"addcoin\",\"services\":1024,\"maxpeers\":256,\"newcoin\":\"BTCD\",\"active\":1}"),0,myinfo->rpcport)) != 0 )