From 055b15d9b8b4435a9466d4d468335ad5a0fc33cf Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 22 Mar 2016 17:18:15 -0300 Subject: [PATCH] test --- iguana/iguana777.h | 11 ++--------- iguana/iguana_init.c | 1 - iguana/main.c | 1 + 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/iguana/iguana777.h b/iguana/iguana777.h index ba9559be6..5aea81199 100755 --- a/iguana/iguana777.h +++ b/iguana/iguana777.h @@ -457,18 +457,11 @@ struct iguana_info struct tai starttime; double startmillis; struct iguana_chain *chain; struct iguana_iAddr *iAddrs; - //struct iguanakv *txids,*spends,*unspents,*pkhashes; - //struct iguana_txid *T; - //struct iguana_unspent *U; struct iguana_Uextra *Uextras; - //struct iguana_spend *S; struct iguana_Sextra *Sextras; - //struct iguana_pkhash *P; struct iguana_account *accounts; struct iguana_pkextra *pkextras; - //struct iguana_counts latest; - //struct iguana_ledger LEDGER,loadedLEDGER; struct iguana_bitmap screen; //struct pollfd fds[IGUANA_MAXPEERS]; struct iguana_peer bindaddr; int32_t numsocks; struct OS_memspace TXMEM; - queue_t acceptQ,hdrsQ,blocksQ,priorityQ,possibleQ,TerminateQ,cacheQ,recvQ; + queue_t acceptQ,hdrsQ,blocksQ,priorityQ,possibleQ,cacheQ,recvQ; double parsemillis,avetime; uint32_t Launched[8],Terminated[8]; portable_mutex_t peers_mutex,blocks_mutex; portable_mutex_t scripts_mutex[2]; FILE *scriptsfp[2]; void *scriptsptr[2]; long scriptsfilesize[2]; @@ -804,7 +797,7 @@ int64_t iguana_bundlecalcs(struct iguana_info *coin,struct iguana_bundle *bp); extern int32_t HDRnet,netBLOCKS; -extern queue_t bundlesQ,validateQ,emitQ,balancesQ; +extern queue_t bundlesQ,validateQ,emitQ,balancesQ,TerminateQ; extern char GLOBALTMPDIR[]; #include "../includes/iguana_api.h" diff --git a/iguana/iguana_init.c b/iguana/iguana_init.c index 9d00881e0..cf5b83dd3 100755 --- a/iguana/iguana_init.c +++ b/iguana/iguana_init.c @@ -32,7 +32,6 @@ void iguana_initQs(struct iguana_info *coin) iguana_initQ(&coin->priorityQ,"priorityQ"); iguana_initQ(&coin->possibleQ,"possibleQ"); iguana_initQ(&coin->cacheQ,"cacheQ"); - iguana_initQ(&coin->TerminateQ,"TerminateQ"); iguana_initQ(&coin->recvQ,"recvQ"); for (i=0; ipeers.active[i].sendQ,"addrsendQ"); diff --git a/iguana/main.c b/iguana/main.c index 6668f4f60..9a9de2580 100755 --- a/iguana/main.c +++ b/iguana/main.c @@ -1120,6 +1120,7 @@ void iguana_main(void *arg) } if ( IGUANA_NUMHELPERS == 0 ) IGUANA_NUMHELPERS = 1; + iguana_initQ(&TerminateQ,"TerminateQ"); iguana_launch(btcd,"rpcloop",iguana_rpcloop,SuperNET_MYINFO(0),IGUANA_PERMTHREAD); category_init(&MYINFO); if ( (coinargs= SuperNET_keysinit(&MYINFO,arg)) != 0 )