Browse Source

Test

etomic
jl777 7 years ago
parent
commit
63225c20e4
  1. 4
      iguana/exchanges/LP_nativeDEX.c
  2. 3
      iguana/exchanges/LP_network.c
  3. 2
      iguana/exchanges/LP_ordermatch.c

4
iguana/exchanges/LP_nativeDEX.c

@ -20,6 +20,8 @@
#include <stdio.h> #include <stdio.h>
#include "LP_include.h" #include "LP_include.h"
portable_mutex_t LP_peermutex,LP_UTXOmutex,LP_utxomutex,LP_commandmutex,LP_cachemutex,LP_swaplistmutex,LP_forwardmutex,LP_pubkeymutex,LP_networkmutex;
#include "LP_network.c" #include "LP_network.c"
struct LP_utxoinfo *LP_utxoinfos[2],*LP_utxoinfos2[2]; struct LP_utxoinfo *LP_utxoinfos[2],*LP_utxoinfos2[2];
@ -31,7 +33,6 @@ char USERPASS[65],USERPASS_WIFSTR[64],USERHOME[512] = { "/root" };
char *default_LPnodes[] = { "5.9.253.195", "5.9.253.196", "5.9.253.197", "5.9.253.198", "5.9.253.199", "5.9.253.200", "5.9.253.201", "5.9.253.202", "5.9.253.203", "5.9.253.204" }; // char *default_LPnodes[] = { "5.9.253.195", "5.9.253.196", "5.9.253.197", "5.9.253.198", "5.9.253.199", "5.9.253.200", "5.9.253.201", "5.9.253.202", "5.9.253.203", "5.9.253.204" }; //
portable_mutex_t LP_peermutex,LP_UTXOmutex,LP_utxomutex,LP_commandmutex,LP_cachemutex,LP_swaplistmutex,LP_forwardmutex,LP_pubkeymutex;
int32_t LP_mypubsock = -1; int32_t LP_mypubsock = -1;
int32_t USERPASS_COUNTER,IAMLP = 0; int32_t USERPASS_COUNTER,IAMLP = 0;
double LP_profitratio = 1.; double LP_profitratio = 1.;
@ -353,6 +354,7 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,double profit
portable_mutex_init(&LP_commandmutex); portable_mutex_init(&LP_commandmutex);
portable_mutex_init(&LP_swaplistmutex); portable_mutex_init(&LP_swaplistmutex);
portable_mutex_init(&LP_cachemutex); portable_mutex_init(&LP_cachemutex);
portable_mutex_init(&LP_networkmutex);
portable_mutex_init(&LP_forwardmutex); portable_mutex_init(&LP_forwardmutex);
portable_mutex_init(&LP_pubkeymutex); portable_mutex_init(&LP_pubkeymutex);
if ( profitmargin == 0. || profitmargin == 0.01 ) if ( profitmargin == 0. || profitmargin == 0.01 )

3
iguana/exchanges/LP_network.c

@ -40,6 +40,7 @@ int32_t LP_send(int32_t sock,char *msg,int32_t freeflag)
{ {
pfd.fd = sock; pfd.fd = sock;
pfd.events = NN_POLLOUT; pfd.events = NN_POLLOUT;
portable_mutex_lock(&LP_networkmutex);
if ( nn_poll(&pfd,1,1) > 0 ) if ( nn_poll(&pfd,1,1) > 0 )
{ {
if ( (sentbytes= nn_send(sock,msg,len,0)) != len ) if ( (sentbytes= nn_send(sock,msg,len,0)) != len )
@ -47,8 +48,10 @@ int32_t LP_send(int32_t sock,char *msg,int32_t freeflag)
//else printf("SENT.(%s)\n",msg); //else printf("SENT.(%s)\n",msg);
if ( freeflag != 0 ) if ( freeflag != 0 )
free(msg); free(msg);
portable_mutex_unlock(&LP_networkmutex);
return(sentbytes); return(sentbytes);
} }
portable_mutex_unlock(&LP_networkmutex);
usleep(1000); usleep(1000);
} }
printf("error LP_send sock.%d, pipeline timeout.(%s) %s\n",sock,msg,nn_strerror(nn_errno())); printf("error LP_send sock.%d, pipeline timeout.(%s) %s\n",sock,msg,nn_strerror(nn_errno()));

2
iguana/exchanges/LP_ordermatch.c

@ -171,7 +171,7 @@ char *LP_quotereceived(cJSON *argjson)
if ( (ptr= LP_cacheadd(Q.srccoin,Q.destcoin,Q.txid,Q.vout,price,&Q)) != 0 ) if ( (ptr= LP_cacheadd(Q.srccoin,Q.destcoin,Q.txid,Q.vout,price,&Q)) != 0 )
{ {
ptr->Q = Q; ptr->Q = Q;
printf("\n>>>>>>>>>> received quote %.8f\n\n",price); printf(">>>>>>>>>> received quote %s/%s %.8f\n",Q.srccoin,Q.destcoin,price);
return(clonestr("{\"result\":\"updated\"}")); return(clonestr("{\"result\":\"updated\"}"));
} else return(clonestr("{\"error\":\"nullptr\"}")); } else return(clonestr("{\"error\":\"nullptr\"}"));
} }

Loading…
Cancel
Save