jl777 7 years ago
parent
commit
b12fcd8967
  1. 4
      crypto777/nanosrc/aio/usock_posix.c
  2. 2
      crypto777/nanosrc/aio/usock_win.c
  3. 22
      crypto777/nanosrc/aio/worker_posix.c
  4. 8
      crypto777/nanosrc/core/global.c
  5. 2
      iguana/exchanges/mm.c

4
crypto777/nanosrc/aio/usock_posix.c

@ -286,11 +286,13 @@ int nn_usock_bind (struct nn_usock *self, const struct sockaddr *addr,
/* Allow re-using the address. */
opt = 1;
printf("call setsockopt in nn_usock_bind\n");
rc = setsockopt (self->s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof (opt));
printf("called setsockopt in nn_usock_bind returns %d\n",rc);
errno_assert (rc == 0);
rc = bind (self->s, addr, (socklen_t) addrlen);
//printf("usock.%d -> bind rc.%d errno.%d %s\n",self->s,rc,errno,nn_strerror(errno));
printf("usock.%d -> bind rc.%d errno.%d %s\n",self->s,rc,errno,nn_strerror(errno));
if (nn_slow (rc != 0))
return -errno;

2
crypto777/nanosrc/aio/usock_win.c

@ -126,7 +126,7 @@ int nn_usock_start (struct nn_usock *self, int domain, int type, int protocol)
#if defined HANDLE_FLAG_INHERIT
BOOL brc;
#endif
printf("nn_usock_start protocol %d\n",protocol);
/* NamedPipes aren't sockets. They don't need all the socket
initialisation stuff. */
if (domain != AF_UNIX) {

22
crypto777/nanosrc/aio/worker_posix.c

@ -102,28 +102,28 @@ void nn_worker_task_term (struct nn_worker_task *self)
int nn_worker_init(struct nn_worker *self)
{
int32_t rc;
PNACL_message("nn_worker_init %p\n",self);
//PNACL_message("nn_worker_init %p\n",self);
rc = nn_efd_init(&self->efd);
PNACL_message("efd init: rc.%d\n",rc);
//PNACL_message("efd init: rc.%d\n",rc);
if ( rc < 0 )
return rc;
PNACL_message("nn_mutex_init\n");
//PNACL_message("nn_mutex_init\n");
nn_mutex_init(&self->sync);
PNACL_message("nn_queue_init\n");
//PNACL_message("nn_queue_init\n");
nn_queue_init(&self->tasks);
PNACL_message("nn_queue_item_init\n");
//PNACL_message("nn_queue_item_init\n");
nn_queue_item_init(&self->stop);
PNACL_message("nn_poller_init\n");
//PNACL_message("nn_poller_init\n");
nn_poller_init(&self->poller);
PNACL_message("nn_poller_add\n");
//PNACL_message("nn_poller_add\n");
nn_poller_add(&self->poller,nn_efd_getfd(&self->efd),&self->efd_hndl);
PNACL_message("nn_poller_set_in\n");
//PNACL_message("nn_poller_set_in\n");
nn_poller_set_in(&self->poller, &self->efd_hndl);
PNACL_message("nn_timerset_init\n");
//PNACL_message("nn_timerset_init\n");
nn_timerset_init(&self->timerset);
PNACL_message("nn_thread_init\n");
//PNACL_message("nn_thread_init\n");
nn_thread_init(&self->thread,nn_worker_routine, self);
PNACL_message("finished nn_worker_init\n");
//PNACL_message("finished nn_worker_init\n");
return 0;
}

8
crypto777/nanosrc/core/global.c

@ -243,11 +243,11 @@ PNACL_message("list init\n");
//sleep(1);
PNACL_message("transports init\n");
// Plug in individual transports.
//nn_global_add_transport(nn_ipc);
nn_global_add_transport(nn_ipc);
nn_global_add_transport(nn_tcp);
//nn_global_add_transport(nn_inproc);
//nn_global_add_transport(nn_ws);
//nn_global_add_transport(nn_tcpmux);
nn_global_add_transport(nn_inproc);
nn_global_add_transport(nn_ws);
nn_global_add_transport(nn_tcpmux);
//sleep(1);
PNACL_message("socktypes init\n");
// Plug in individual socktypes

2
iguana/exchanges/mm.c

@ -35,7 +35,7 @@ char *stats_JSON(void *ctx,char *myipaddr,int32_t pubsock,cJSON *argjson,char *r
void LP_priceupdate(char *base,char *rel,double price,double avebid,double aveask,double highbid,double lowask,double PAXPRICES[32]);
//defined(__APPLE__) ||
#if defined(WIN32) || defined(USE_STATIC_NANOMSG)
#ifdef FROM_JS // defined(WIN32) || defined(USE_STATIC_NANOMSG)
#include "../../crypto777/nanosrc/nn.h"
#include "../../crypto777/nanosrc/bus.h"
#include "../../crypto777/nanosrc/pubsub.h"

Loading…
Cancel
Save