From 848069d2694fe65bada4474de3ac23781878a7ef Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 22 May 2016 11:14:34 -0500 Subject: [PATCH] test --- iguana/exchanges/bitcoin.c | 4 ++-- iguana/exchanges777.h | 2 +- iguana/iguana_exchanges.c | 6 ++---- iguana/iguana_instantdex.c | 18 +++++++++--------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/iguana/exchanges/bitcoin.c b/iguana/exchanges/bitcoin.c index 82d7b49ff..2bcb4ffe9 100755 --- a/iguana/exchanges/bitcoin.c +++ b/iguana/exchanges/bitcoin.c @@ -517,12 +517,12 @@ char *OPENORDERS(struct exchange_info *exchange,cJSON *argjson) char *TRADEHISTORY(struct exchange_info *exchange,cJSON *argjson) { struct bitcoin_swapinfo *swap,*tmp; cJSON *retjson = cJSON_CreateArray(); - portable_mutex_lock(&exchange->mutexH); + portable_mutex_lock(&exchange->mutex); DL_FOREACH_SAFE(exchange->history,swap,tmp) { jaddi(retjson,instantdex_historyjson(swap)); } - portable_mutex_unlock(&exchange->mutexH); + portable_mutex_unlock(&exchange->mutex); return(jprint(retjson,1)); } diff --git a/iguana/exchanges777.h b/iguana/exchanges777.h index 69c8ac1d4..92b9a886c 100755 --- a/iguana/exchanges777.h +++ b/iguana/exchanges777.h @@ -74,7 +74,7 @@ struct exchange_info { struct exchange_funcs issue; char name[16],apikey[MAX_JSON_FIELD],apisecret[MAX_JSON_FIELD],tradepassword[MAX_JSON_FIELD],userid[MAX_JSON_FIELD]; - uint32_t exchangeid,pollgap,lastpoll; portable_mutex_t mutex,mutexH,mutexS,mutexP,mutexR,mutexT; + uint32_t exchangeid,pollgap,lastpoll; portable_mutex_t mutex,mutexP,mutexR,mutexT; uint64_t lastnonce,exchangebits; double commission; void *privatedata; struct tradebot_info *tradebots; diff --git a/iguana/iguana_exchanges.c b/iguana/iguana_exchanges.c index 4ad9c3551..6504f9b75 100755 --- a/iguana/iguana_exchanges.c +++ b/iguana/iguana_exchanges.c @@ -587,14 +587,14 @@ void iguana_statemachineupdate(struct supernet_info *myinfo,struct exchange_info { struct iguana_info *coin; struct bitcoin_swapinfo *swap,*tmp; struct iguana_bundlereq *req; coin = iguana_coinfind("BTCD"); - portable_mutex_lock(&exchange->mutexS); + portable_mutex_lock(&exchange->mutex); DL_FOREACH_SAFE(exchange->statemachines,swap,tmp) { if ( swap->dead != 0 || swap->mine.dead != 0 || swap->other.dead != 0 ) DL_DELETE(exchange->statemachines,swap); else instantdex_statemachine_iter(myinfo,exchange,swap); } - portable_mutex_unlock(&exchange->mutexS); + portable_mutex_unlock(&exchange->mutex); while ( (req= queue_dequeue(&exchange->recvQ,0)) != 0 ) { if ( instantdex_recvquotes(coin,req,req->hashes,req->n) != 0 ) @@ -915,8 +915,6 @@ struct exchange_info *exchange_create(char *exchangestr,cJSON *argjson) } exchange = calloc(1,sizeof(*exchange)); portable_mutex_init(&exchange->mutex); - portable_mutex_init(&exchange->mutexS); - portable_mutex_init(&exchange->mutexH); portable_mutex_init(&exchange->mutexP); portable_mutex_init(&exchange->mutexR); portable_mutex_init(&exchange->mutexT); diff --git a/iguana/iguana_instantdex.c b/iguana/iguana_instantdex.c index d2b042970..bce5dba93 100755 --- a/iguana/iguana_instantdex.c +++ b/iguana/iguana_instantdex.c @@ -75,7 +75,7 @@ int32_t instantdex_orderidcmp(uint64_t orderidA,uint64_t orderidB,int32_t strict orderidA &= INSTANTDEX_ORDERSTATE_ORDERIDMASK; orderidB &= INSTANTDEX_ORDERSTATE_ORDERIDMASK; } - printf("orderidA %llx vs orderidB %llx -> %llx\n",(long long)orderidA,(long long)orderidB,(long long)(orderidA ^ orderidB)); + //printf("orderidA %llx vs orderidB %llx -> %llx\n",(long long)orderidA,(long long)orderidB,(long long)(orderidA ^ orderidB)); return((orderidA ^ orderidB) != 0); } @@ -713,7 +713,7 @@ cJSON *instantdex_historyjson(struct bitcoin_swapinfo *swap) struct bitcoin_swapinfo *instantdex_historyfind(struct supernet_info *myinfo,struct exchange_info *exchange,uint64_t orderid) { struct bitcoin_swapinfo *swap,*tmp,*retswap = 0; - portable_mutex_lock(&exchange->mutexH); + portable_mutex_lock(&exchange->mutex); DL_FOREACH_SAFE(exchange->history,swap,tmp) { if ( instantdex_orderidcmp(swap->mine.orderid,orderid,0) == 0 ) @@ -722,22 +722,22 @@ struct bitcoin_swapinfo *instantdex_historyfind(struct supernet_info *myinfo,str //break; } } - portable_mutex_unlock(&exchange->mutexH); + portable_mutex_unlock(&exchange->mutex); return(retswap); } void instantdex_historyadd(struct exchange_info *exchange,struct bitcoin_swapinfo *swap) { - portable_mutex_lock(&exchange->mutexH); + portable_mutex_lock(&exchange->mutex); DL_APPEND(exchange->history,swap); - portable_mutex_unlock(&exchange->mutexH); + portable_mutex_unlock(&exchange->mutex); } struct bitcoin_swapinfo *instantdex_statemachinefind(struct supernet_info *myinfo,struct exchange_info *exchange,uint64_t orderid) { struct bitcoin_swapinfo *tmp,*swap,*retswap = 0; uint32_t now; now = (uint32_t)time(NULL); - portable_mutex_lock(&exchange->mutexS); + portable_mutex_lock(&exchange->mutex); DL_FOREACH_SAFE(exchange->statemachines,swap,tmp) { //printf("%p search for orderid.%llx in (%llx/%llx) %u %u\n",exchange->statemachines,(long long)orderid,(long long)swap->mine.orderid,(long long)swap->other.orderid,swap->mine.dead,swap->other.dead); @@ -758,7 +758,7 @@ struct bitcoin_swapinfo *instantdex_statemachinefind(struct supernet_info *myinf } } //printf("found statemachine.%p\n",retswap); - portable_mutex_unlock(&exchange->mutexS); + portable_mutex_unlock(&exchange->mutex); return(retswap); } @@ -809,9 +809,9 @@ struct instantdex_accept *instantdex_offerfind(struct supernet_info *ignore,stru void instantdex_statemachineadd(struct exchange_info *exchange,struct bitcoin_swapinfo *swap) { - portable_mutex_lock(&exchange->mutexS); + portable_mutex_lock(&exchange->mutex); DL_APPEND(exchange->statemachines,swap); - portable_mutex_unlock(&exchange->mutexS); + portable_mutex_unlock(&exchange->mutex); if ( instantdex_statemachinefind(0,exchange,swap->mine.orderid) == 0 && instantdex_statemachinefind(0,exchange,swap->other.orderid) == 0 ) { printf("cant find just added FSM.(%llx/%llx)\n",(long long)swap->mine.orderid,(long long)swap->other.orderid);