optimise one more

Author: shikokuchuo

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 0.9.2.9036
+Version: 0.9.2.9037
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is 
     a socket library providing high-performance scalability protocols, a
     cross-platform standard for messaging and communications. Serves as a

NEWS.md

@@ -1,4 +1,4 @@
-# nanonext 0.9.2.9036 (development)
+# nanonext 0.9.2.9037 (development)
 
 #### New Features
 

src/core.c

@@ -356,9 +356,10 @@ SEXP nano_decode(unsigned char *buf, size_t sz, const int mod) {
 
   switch (mod) {
   case 2:
-    PROTECT(data = Rf_allocVector(STRSXP, sz));
+    size = sz / 2 + 1;
+    PROTECT(data = Rf_allocVector(STRSXP, size));
     R_xlen_t i, m, nbytes = sz, np = 0;
-    for (i = 0, m = 0; i < sz; i++) {
+    for (i = 0, m = 0; i < size; i++) {
       SEXP onechar = rawOneString(buf, nbytes, &np);
       if (onechar == R_NilValue) break;
       SET_STRING_ELT(data, i, onechar);

tests/tests.R

@@ -100,11 +100,13 @@ nanotestn(stop_aio(n))
 nanotest(identical(call_aio(msg), msg))
 nanotesterr(msg$data, "active")
 nanotest(identical(call_aio(n), n))
-nanotest(!is_aio(n))
 nanotestaio(sraio <- n$send_aio(as.raw(0L), mode = "r", timeout = 500))
 nanotestaio(rraio <- n1$recv_aio(mode = 1L, timeout = 500))
 nanotestw(is_nul_byte(call_aio(rraio)$data))
-nanotestaio(sraio <- n$send_aio(c(1+2i, 4+3i), mode = "ra", timeout = 500))
+nanotestaio(sraio <- n$send_aio(as.raw(1L), mode = "ra", timeout = 500))
+nanotestaio(rraio <- n1$recv_aio(mode = "raw", timeout = 500))
+nanotest(is.raw(call_aio(rraio)$data))
+nanotestaio(sraio <- n$send_aio(c(1+2i, 4+3i), mode = "raw", timeout = 500))
 nanotestaio(rraio <- n1$recv_aio(mode = "co", timeout = 500))
 nanotest(is.complex(call_aio(rraio)$data))
 nanotestaio(sraio <- n$send_aio(5, mode = "raw", timeout = 500))
@@ -203,11 +205,15 @@ nanotest(!unresolved(msg))
 nanotest(is.integer(req$send(c(TRUE, FALSE, TRUE), mode = 2L, block = 500)))
 nanotestaio(msg <- recv_aio(ctx, mode = 6L, timeout = 500))
 nanotest(is.logical(call_aio(msg)$data))
-nanotestaio(err <- send_aio(ctx, msg, mode = 2L))
+nanotestaio(err <- send_aio(ctx, msg, mode = "raw"))
 nanotestn(stop_aio(err))
 nanotesterr(err$result, "active")
 nanotestaio(err <- send_aio(ctx, "test"))
 nanotest(is_error_value(call_aio(err)$result))
+nanotest(is.integer(req$send(as.raw(1L), mode = 2L, block = 500)))
+nanotestaio(msg <- call_aio(recv_aio(ctx, mode = 8L, timeout = 500)))
+nanotestaio(envraw <- send_aio(ctx, msg, mode = 2L, timeout = 500))
+nanotest(identical(req$recv(mode = 8L, block = 500), as.raw(1L)))
 nanotestaio(rek <- request(req$context, c(1+3i, 4+2i), recv_mode = "complex", timeout = 500))
 nanotest(is.integer(reply(ctx, execute = identity, send_mode = "ra", timeout = 500)))
 nanotest(is.complex(call_aio(rek)[["data"]]))