Test

iguana/exchanges/LP_include.h

@@ -295,6 +295,7 @@ int32_t LP_pullsock_check(void *ctx,char **retstrp,char *myipaddr,int32_t pubsoc
 uint16_t LP_psock_get(char *connectaddr,char *publicaddr,int32_t ispaired);
 //void LP_utxo_clientpublish(struct LP_utxoinfo *utxo);
 int32_t LP_coinbus(uint16_t coin_busport);
+int32_t LP_nanomsg_recvs(void *ctx);
 int32_t LP_reserved_msgs();
 int32_t LP_reserved_msg(char *base,char *rel,bits256 pubkey,char *msg);
 struct iguana_info *LP_coinfind(char *symbol);

iguana/exchanges/LP_nativeDEX.c

@@ -32,7 +32,7 @@
 
 #include <stdio.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,LP_psockmutex,LP_coinmutex,LP_messagemutex,LP_portfoliomutex,LP_electrummutex,LP_butxomutex,LP_reservedmutex;
+portable_mutex_t LP_peermutex,LP_UTXOmutex,LP_utxomutex,LP_commandmutex,LP_cachemutex,LP_swaplistmutex,LP_forwardmutex,LP_pubkeymutex,LP_networkmutex,LP_psockmutex,LP_coinmutex,LP_messagemutex,LP_portfoliomutex,LP_electrummutex,LP_butxomutex,LP_reservedmutex,LP_nanorecvsmutex;
 int32_t LP_canbind;
 char *Broadcaststr,*Reserved_msgs[1000];
 int32_t num_Reserved_msgs,max_Reserved_msgs;
@@ -274,40 +274,48 @@ int32_t LP_sock_check(char *typestr,void *ctx,char *myipaddr,int32_t pubsock,int
     return(nonz);
 }
 
-void command_rpcloop(void *myipaddr)
+int32_t LP_nanomsg_recvs(void *ctx)
 {
-    int32_t nonz = 0; char *origipaddr; struct LP_peerinfo *peer,*tmp; void *ctx;
-    ctx = bitcoin_ctx();
-    if ( (origipaddr= myipaddr) == 0 )
+    int32_t nonz = 0; char *origipaddr; struct LP_peerinfo *peer,*tmp;
+    if ( (origipaddr= LP_myipaddr) == 0 )
         origipaddr = "127.0.0.1";
-    while ( 1 )
+    fprintf(stderr,".");
+    portable_mutex_lock(&LP_nanorecvsmutex);
+    HASH_ITER(hh,LP_peerinfos,peer,tmp)
     {
-        fprintf(stderr,".");
-        nonz = 0;
-        HASH_ITER(hh,LP_peerinfos,peer,tmp)
+        if ( peer->errors >= LP_MAXPEER_ERRORS )
         {
-            if ( peer->errors >= LP_MAXPEER_ERRORS )
+            if ( (rand() % 10000) == 0 )
+                peer->errors--;
+            else
             {
-                if ( (rand() % 10000) == 0 )
-                    peer->errors--;
-                else
-                {
-                    //printf("skip %s\n",peer->ipaddr);
-                    continue;
-                }
+                //printf("skip %s\n",peer->ipaddr);
+                continue;
             }
-            //printf("check %s pubsock.%d\n",peer->ipaddr,peer->subsock);
-            nonz += LP_sock_check("PULL",ctx,origipaddr,LP_mypubsock,peer->subsock,peer->ipaddr);
         }
-        /*HASH_ITER(hh,LP_coins,coin,ctmp) // firstrefht,firstscanht,lastscanht
-        {
-            if ( coin->inactive != 0 )
-                continue;
-            if ( coin->bussock >= 0 )
-                nonz += LP_sock_check(coin->symbol,ctx,origipaddr,-1,coin->bussock,LP_profitratio - 1.);
-        }*/
-        if ( LP_mypullsock >= 0 )
-            nonz += LP_sock_check("SUB",ctx,origipaddr,-1,LP_mypullsock,"127.0.0.1");
+        //printf("check %s pubsock.%d\n",peer->ipaddr,peer->subsock);
+        nonz += LP_sock_check("PULL",ctx,origipaddr,LP_mypubsock,peer->subsock,peer->ipaddr);
+    }
+    /*HASH_ITER(hh,LP_coins,coin,ctmp) // firstrefht,firstscanht,lastscanht
+     {
+     if ( coin->inactive != 0 )
+     continue;
+     if ( coin->bussock >= 0 )
+     nonz += LP_sock_check(coin->symbol,ctx,origipaddr,-1,coin->bussock,LP_profitratio - 1.);
+     }*/
+    if ( LP_mypullsock >= 0 )
+        nonz += LP_sock_check("SUB",ctx,origipaddr,-1,LP_mypullsock,"127.0.0.1");
+    portable_mutex_unlock(&LP_nanorecvsmutex);
+    return(nonz);
+}
+
+void command_rpcloop(void *myipaddr)
+{
+    int32_t nonz = 0; void *ctx;
+    ctx = bitcoin_ctx();
+    while ( 1 )
+    {
+        nonz = LP_nanomsg_recvs(ctx);
         //if ( LP_mybussock >= 0 )
         //    nonz += LP_sock_check("BUS",ctx,origipaddr,-1,LP_mybussock);
         if ( nonz == 0 )
@@ -784,6 +792,7 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
     portable_mutex_init(&LP_portfoliomutex);
     portable_mutex_init(&LP_butxomutex);
     portable_mutex_init(&LP_reservedmutex);
+    portable_mutex_init(&LP_nanorecvsmutex);
 #ifndef _WIN32
     if ( system("curl -s4 checkip.amazonaws.com > DB/myipaddr") == 0 )
     {

iguana/exchanges/LP_ordermatch.c

@@ -417,6 +417,9 @@ double LP_query(void *ctx,char *myipaddr,int32_t mypubsock,char *method,struct L
                 break;
             }
         }
+        while ( 1 )
+            if ( LP_nanomsg_recvs(ctx) <= 0 )
+                break;
         sleep(1);
     }
     return(price);