allow opt() to get options for a Pipe

shikokuchuo · Nov 25, 2024 · f82d28e · f82d28e
1 parent d713c85
commit f82d28e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 1.3.2.9000
+Version: 1.3.2.9001
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
     a socket library implementing 'Scalability Protocols', a reliable,
     high-performance standard for common communications patterns including

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
-# nanonext 1.3.2.9000 (development)
+# nanonext 1.3.2.9001 (development)
+
+#### New Features
+
+* `opt()` gains the ability to retrieve options from a Pipe.
 
 # nanonext 1.3.2
 

diff --git a/src/utils.c b/src/utils.c
@@ -482,8 +482,26 @@ SEXP rnng_get_opt(SEXP object, SEXP opt) {
       typ = 6; break;
     }
 
+  } else if (ptrtag == nano_PipeSymbol) {
+
+      nng_pipe *p = (nng_pipe *) NANO_PTR(object);
+      for (;;) {
+        xc = nng_pipe_get_string(*p, op, &optval.str);
+        if (xc == 0) { typ = 1; break; }
+        xc = nng_pipe_get_ms(*p, op, &optval.d);
+        if (xc == 0) { typ = 2; break; }
+        xc = nng_pipe_get_size(*p, op, &optval.s);
+        if (xc == 0) { typ = 3; break; }
+        xc = nng_pipe_get_int(*p, op, &optval.i);
+        if (xc == 0) { typ = 4; break; }
+        xc = nng_pipe_get_bool(*p, op, &optval.b);
+        if (xc == 0) { typ = 5; break; }
+        xc = nng_pipe_get_uint64(*p, op, &optval.u);
+        typ = 6; break;
+      }
+
   } else {
-    Rf_error("'object' is not a valid Socket, Context, Stream, Listener or Dialer");
+    Rf_error("'object' is not a valid Socket, Context, Stream, Listener, Dialer or Pipe");
   }
 
   if (xc)

diff --git a/tests/tests.R b/tests/tests.R
@@ -210,6 +210,8 @@ test_class("recvAio", r <- recv_aio(rep, timeout = 500))
 test_zero(req$send("", block = 500))
 test_print(p <- tryCatch(collect_pipe(r), error = function(e) NULL))
 if (!is.null(p)) test_class("nano", p)
+if (is_nano(p)) test_type("integer", p$id)
+if (is_nano(p)) test_type("integer", opt(p, "recv-fd"))
 test_true(.mark())
 test_class("sendAio", r <- send_aio(if (is_nano(p)) p else rep, "", timeout = 500))
 if (later) test_null(.keep(r, new.env()))
@@ -323,6 +325,7 @@ test_equal(suppressWarnings(close(ctx)), 7L)
 test_zero(close(rep))
 if (is_nano(p)) test_equal(reap(p), 12L)
 if (is_nano(p)) test_equal(suppressWarnings(close(p)), 12L)
+if (is_nano(p)) test_error(opt(p, "recv-fd"), "12")
 
 test_class("nanoObject", pub <- nano("pub", listen = "inproc://ps"))
 test_class("nanoObject", sub <- nano("sub", dial = "inproc://ps", autostart = NA))