diff options
| author | Garrett D'Amore <garrett@damore.org> | 2019-03-13 00:50:48 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2019-03-13 00:50:48 -0700 |
| commit | f723fa9655e1e7fadc1a15b94b66de674ab9fe17 (patch) | |
| tree | 8788e128e723bbd936bee0b03287a49df789a116 /tests | |
| parent | f65f819f7fb3bbe9e24bc73342b4f335f5034fe0 (diff) | |
| download | nng-f723fa9655e1e7fadc1a15b94b66de674ab9fe17.tar.gz nng-f723fa9655e1e7fadc1a15b94b66de674ab9fe17.tar.bz2 nng-f723fa9655e1e7fadc1a15b94b66de674ab9fe17.zip | |
fixes #815 Eliminate socket filters on message queues
This also eliminates the enforcement of NNG_OPT_RECVMAXSZ for inproc,
which never really made much sense. This helps inproc go faster.
While here, also clean up the entry point for protocols to support
a drain option, since we don't use that anywhere.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/set_recvmaxsize.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/tests/set_recvmaxsize.c b/tests/set_recvmaxsize.c index 381f77fa..1e8c255a 100644 --- a/tests/set_recvmaxsize.c +++ b/tests/set_recvmaxsize.c @@ -15,36 +15,35 @@ #define RCVBUFSIZE 200 const char *addrs[] = { - "inproc:///tmp/inproctmp_setrecvmaxsz", - "ipc:///tmp/ipctemp_setrecvmaxsz", - "tcp://127.0.0.1:43895", - "ws://127.0.0.1:43897", + "ipc:///tmp/ipctemp_setrecvmaxsz", + "tcp://127.0.0.1:43895", + "ws://127.0.0.1:43897", }; TestMain("recvmaxsize", { // we don't actually care what the content of the message is. - char msg[SNDBUFSIZE]; - char rcvbuf[RCVBUFSIZE]; - size_t rcvsize = RCVBUFSIZE; - nng_socket s0; - nng_socket s1; + char msg[SNDBUFSIZE]; + char rcvbuf[RCVBUFSIZE]; + size_t rcvsize = RCVBUFSIZE; + nng_socket s0; + nng_socket s1; nng_listener l; - int numproto = sizeof addrs / sizeof *addrs; - Convey("recvmaxsize can be set after listening", { - for (int i = 0; i < numproto; i++) { - const char *addr = addrs[i]; - So(nng_pair1_open(&s0) == 0); - So(nng_setopt_ms(s0, NNG_OPT_RECVTIMEO, 100) == 0); - So(nng_setopt_size(s0, NNG_OPT_RECVMAXSZ, 200) == 0); - So(nng_listen(s0, addr, &l, 0) == 0); - So(nng_setopt_size(s0, NNG_OPT_RECVMAXSZ, 100) == 0); + int numproto = sizeof addrs / sizeof *addrs; + Convey("recvmaxsize can be set after listening", { + for (int i = 0; i < numproto; i++) { + const char *addr = addrs[i]; + So(nng_pair1_open(&s0) == 0); + So(nng_setopt_ms(s0, NNG_OPT_RECVTIMEO, 100) == 0); + So(nng_setopt_size(s0, NNG_OPT_RECVMAXSZ, 200) == 0); + So(nng_listen(s0, addr, &l, 0) == 0); + So(nng_setopt_size(s0, NNG_OPT_RECVMAXSZ, 100) == 0); - So(nng_pair1_open(&s1) == 0); - So(nng_dial(s1, addr, NULL, 0) == 0); - So(nng_send(s1, msg, 150, 0) == 0); - So(nng_recv(s0, rcvbuf, &rcvsize, 0) == NNG_ETIMEDOUT); - So(nng_close(s0) == 0); - So(nng_close(s1) == 0); - } - }); + So(nng_pair1_open(&s1) == 0); + So(nng_dial(s1, addr, NULL, 0) == 0); + So(nng_send(s1, msg, 150, 0) == 0); + So(nng_recv(s0, rcvbuf, &rcvsize, 0) == NNG_ETIMEDOUT); + So(nng_close(s0) == 0); + So(nng_close(s1) == 0); + } + }); }) |