From ec2574b09a746709f15d2a3f5de135e29f4bcb52 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 8 Jan 2017 11:18:16 -0800 Subject: Move to generic socket & pipe workers, and up to 4 each. This should eliminate all need for protocols to do their own thread management tasks. --- src/protocol/pubsub/pub.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/protocol/pubsub/pub.c') diff --git a/src/protocol/pubsub/pub.c b/src/protocol/pubsub/pub.c index 684b916d..b597f896 100644 --- a/src/protocol/pubsub/pub.c +++ b/src/protocol/pubsub/pub.c @@ -257,20 +257,16 @@ static nni_proto_pipe_ops nni_pub_pipe_ops = { .pipe_fini = nni_pub_pipe_fini, .pipe_add = nni_pub_pipe_add, .pipe_rem = nni_pub_pipe_rem, - .pipe_send = nni_pub_pipe_send, - .pipe_recv = nni_pub_pipe_recv, + .pipe_worker = { nni_pub_pipe_send, + nni_pub_pipe_recv }, }; nni_proto_sock_ops nni_pub_sock_ops = { .sock_init = nni_pub_sock_init, .sock_fini = nni_pub_sock_fini, - .sock_close = NULL, .sock_setopt = nni_pub_sock_setopt, .sock_getopt = nni_pub_sock_getopt, - .sock_send = nni_pub_sock_send, - .sock_recv = NULL, - .sock_rfilter = NULL, - .sock_sfilter = NULL, + .sock_worker = { nni_pub_sock_send }, }; nni_proto nni_pub_proto = { -- cgit v1.2.3-70-g09d2