diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-03-19 16:21:13 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-03-19 16:21:13 -0700 |
| commit | b8a133a9d6c5d8439c1f8ed3153d6a750aae3646 (patch) | |
| tree | 0aed9586538b1330e836501612a66074093c32e8 /src/protocol/pubsub/pub.c | |
| parent | 351ae4c98f65e5cbc71c27d6ab6410fb6228ca54 (diff) | |
| download | nng-b8a133a9d6c5d8439c1f8ed3153d6a750aae3646.tar.gz nng-b8a133a9d6c5d8439c1f8ed3153d6a750aae3646.tar.bz2 nng-b8a133a9d6c5d8439c1f8ed3153d6a750aae3646.zip | |
Eliminate p_active, better names for pipe start and stop.
Diffstat (limited to 'src/protocol/pubsub/pub.c')
| -rw-r--r-- | src/protocol/pubsub/pub.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/protocol/pubsub/pub.c b/src/protocol/pubsub/pub.c index ad0b9580..a37fe991 100644 --- a/src/protocol/pubsub/pub.c +++ b/src/protocol/pubsub/pub.c @@ -147,7 +147,7 @@ nni_pub_pipe_fini(void *arg) static int -nni_pub_pipe_add(void *arg) +nni_pub_pipe_start(void *arg) { nni_pub_pipe *pp = arg; nni_pub_sock *pub = pp->pub; @@ -168,13 +168,15 @@ nni_pub_pipe_add(void *arg) static void -nni_pub_pipe_rem(void *arg) +nni_pub_pipe_stop(void *arg) { nni_pub_pipe *pp = arg; nni_pub_sock *pub = pp->pub; - nni_list_remove(&pub->pipes, pp); - nni_msgq_close(pp->sendq); + if (nni_list_active(&pub->pipes, pp)) { + nni_list_remove(&pub->pipes, pp); + nni_msgq_close(pp->sendq); + } } @@ -314,8 +316,8 @@ nni_pub_sock_getopt(void *arg, int opt, void *buf, size_t *szp) static nni_proto_pipe_ops nni_pub_pipe_ops = { .pipe_init = nni_pub_pipe_init, .pipe_fini = nni_pub_pipe_fini, - .pipe_add = nni_pub_pipe_add, - .pipe_rem = nni_pub_pipe_rem, + .pipe_start = nni_pub_pipe_start, + .pipe_stop = nni_pub_pipe_stop, }; nni_proto_sock_ops nni_pub_sock_ops = { |