From 563b2389f1478aeea6c37ee15b90b6c6c905332b Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 27 Aug 2016 23:22:09 -0300 Subject: [PATCH] test --- iguana/iguana777.c | 2 +- iguana/m_LP | 1 + iguana/m_osx | 13 ++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/iguana/iguana777.c b/iguana/iguana777.c index 2583b8273..e1dcd2088 100755 --- a/iguana/iguana777.c +++ b/iguana/iguana777.c @@ -690,7 +690,7 @@ void iguana_helper(void *arg) allcurrent = 0; //printf("h.%d [%d] bundleQ size.%d lag.%ld\n",helperid,bp->hdrsi,queue_size(&bundlesQ),time(NULL) - bp->nexttime); coin->numbundlesQ--; - if ( coin->started != 0 && (bp->nexttime == 0 || time(NULL) > bp->nexttime) && coin->active != 0 ) + if ( coin->started != 0 && (bp->nexttime == 0 || time(NULL) >= bp->nexttime) && coin->active != 0 ) { flag += iguana_bundleiters(myinfo,ptr->coin,&MEM,MEMB,bp,ptr->timelimit,IGUANA_DEFAULTLAG); } diff --git a/iguana/m_LP b/iguana/m_LP index 740fbb1e8..c93f4f482 100755 --- a/iguana/m_LP +++ b/iguana/m_LP @@ -2,6 +2,7 @@ rm ../agents/iguana *.o git pull cd secp256k1; ./m_unix; cd .. +cd ../crypto777; ./m_LP; cd ../iguana gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c -O2 -DLIQUIDITY_PROVIDER=1 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c gcc -g -fno-aggressive-loop-optimizations -Wno-deprecated -c -DLIQUIDITY_PROVIDER=1 main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lcurl -lssl -lcrypto -lpthread -lz -lm diff --git a/iguana/m_osx b/iguana/m_osx index 60963b1e0..222dccae4 100755 --- a/iguana/m_osx +++ b/iguana/m_osx @@ -1,8 +1,7 @@ +#./configure --enable-endomorphism --enable-module-ecdh --enable-module-schnorr --enable-module-rangeproof --enable-experimental --enable-module_recovery rm ../agents/iguana *.o -if [[ $# -eq 0 ]]; then - git pull -fi -cd secp256k1; ./m_osx; cd .. -gcc -g -Wno-deprecated -c -O2 *.c databases/iguana_DB.c -gcc -g -Wno-deprecated -c main.c iguana777.c iguana_bundles.c -gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lpthread -lm +git pull +cd secp256k1; ./m_unix; cd .. +gcc -g -Wno-deprecated -c -O2 -DLIQUIDITY_PROVIDER=1 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c +gcc -g -Wno-deprecated -c -DLIQUIDITY_PROVIDER=1 main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c +gcc -g -o ../agents/iguana *.o ../agents/libcrypto777.a -lcurl -lssl -lcrypto -lpthread -lz -lm