diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-11-09 19:17:06 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-11-09 19:17:06 -0800 |
| commit | f7dab3e92515e3254560e696b91f7d0eb526f0f6 (patch) | |
| tree | cfd1b7c8e1b61ad974457d33e7b80d4a370fbe61 /src/core/socket.c | |
| parent | 46a383a1d27dee6052936fd80f565e06afdf6aac (diff) | |
| download | nng-f7dab3e92515e3254560e696b91f7d0eb526f0f6.tar.gz nng-f7dab3e92515e3254560e696b91f7d0eb526f0f6.tar.bz2 nng-f7dab3e92515e3254560e696b91f7d0eb526f0f6.zip | |
fixes #782 stat namespace collision on QNX
Diffstat (limited to 'src/core/socket.c')
| -rw-r--r-- | src/core/socket.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 63696b36..22fa5c07 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1472,12 +1472,11 @@ nni_dialer_add_pipe(nni_dialer *d, void *tpipe) nni_mtx_lock(&s->s_mx); if (s->s_closed || d->d_closing || - (nni_pipe_create(&p, s, d->d_tran, tpipe) != 0)) { + (nni_pipe_create_dialer(&p, d, tpipe) != 0)) { nni_mtx_unlock(&s->s_mx); return; } - p->p_dialer = d; nni_list_append(&d->d_pipes, p); nni_list_append(&s->s_pipes, p); d->d_pipe = p; @@ -1486,8 +1485,6 @@ nni_dialer_add_pipe(nni_dialer *d, void *tpipe) nni_stat_inc_atomic(&s->s_stats.s_npipes, 1); nni_stat_inc_atomic(&d->d_stats.s_npipes, 1); - nni_pipe_stats_init(p); - nni_pipe_run_cb(p, NNG_PIPE_EV_ADD_PRE); nni_mtx_lock(&s->s_mx); @@ -1586,20 +1583,17 @@ nni_listener_add_pipe(nni_listener *l, void *tpipe) nni_mtx_lock(&s->s_mx); if (s->s_closed || l->l_closing || - (nni_pipe_create(&p, s, l->l_tran, tpipe) != 0)) { + (nni_pipe_create_listener(&p, l, tpipe) != 0)) { nni_mtx_unlock(&s->s_mx); return; } - p->p_listener = l; nni_list_append(&l->l_pipes, p); nni_list_append(&s->s_pipes, p); nni_mtx_unlock(&s->s_mx); nni_stat_inc_atomic(&l->l_stats.s_npipes, 1); nni_stat_inc_atomic(&s->s_stats.s_npipes, 1); - nni_pipe_stats_init(p); - nni_pipe_run_cb(p, NNG_PIPE_EV_ADD_PRE); nni_mtx_lock(&s->s_mx); |