keep at NNG 1.5.2 for release

Author: shikokuchuo

NEWS.md

@@ -7,10 +7,9 @@
 
 #### Updates
 
-* NNG library used for building from source (and on Windows) updated to 1.6.0 pre-release.
 * Setting 'NANONEXT_TLS=1' now allows the downloaded NNG library to be built against a system mbedtls installation.
 * Deprecated `send_ctx()`, `recv_ctx()` and logging are removed.
-* Internal performance optimisations.
+* All-round internal performance optimisations.
 
 # nanonext 0.4.0
 

README.Rmd

@@ -463,7 +463,7 @@ This is available in system package repositories as:
 
 A system installation of 'libnng' in the standard filesystem locations will be detected and used if possible.
 
-Otherwise, a suitable recent version of 'libnng' will be downloaded and built from source automatically during package installation (note: this requires 'cmake').
+Otherwise, the latest release version of 'libnng' will be downloaded and built from source automatically during package installation (note: this requires 'cmake').
 
 #### Windows
 

README.md

@@ -379,7 +379,7 @@ aio
 #> < recvAio >
 #>  - $data for message data
 aio$data |> str()
-#>  num [1:100000000] 2.698 0.0645 -1.0922 2.1422 0.8848 ...
+#>  num [1:100000000] 0.112 0.003 2.633 -0.609 -0.476 ...
 ```
 
 As `call_aio()` is blocking and will wait for completion, an alternative
@@ -516,11 +516,11 @@ ncurl("http://httpbin.org/headers")
 #>   [1] 7b 0a 20 20 22 68 65 61 64 65 72 73 22 3a 20 7b 0a 20 20 20 20 22 48 6f 73
 #>  [26] 74 22 3a 20 22 68 74 74 70 62 69 6e 2e 6f 72 67 22 2c 20 0a 20 20 20 20 22
 #>  [51] 58 2d 41 6d 7a 6e 2d 54 72 61 63 65 2d 49 64 22 3a 20 22 52 6f 6f 74 3d 31
-#>  [76] 2d 36 32 36 37 31 36 30 32 2d 32 35 64 63 33 32 39 63 30 39 35 34 64 36 33
-#> [101] 39 37 37 62 34 30 35 32 39 22 0a 20 20 7d 0a 7d 0a
+#>  [76] 2d 36 32 36 38 37 33 65 39 2d 36 66 33 37 32 32 39 34 32 61 34 31 39 31 36
+#> [101] 35 30 35 37 31 38 35 33 31 22 0a 20 20 7d 0a 7d 0a
 #> 
 #> $data
-#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-62671602-25dc329c0954d63977b40529\"\n  }\n}\n"
+#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-626873e9-6f3722942a41916505718531\"\n  }\n}\n"
 ```
 
 For advanced use, supports additional HTTP methods such as POST or PUT.
@@ -535,7 +535,7 @@ res
 #>  - $raw for raw message
 
 call_aio(res)$data
-#> [1] "{\n  \"args\": {}, \n  \"data\": \"{\\\"key\\\": \\\"value\\\"}\", \n  \"files\": {}, \n  \"form\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Length\": \"16\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-62671603-121afeba10cc694a091360a9\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"78.145.225.121\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
+#> [1] "{\n  \"args\": {}, \n  \"data\": \"{\\\"key\\\": \\\"value\\\"}\", \n  \"files\": {}, \n  \"form\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Length\": \"16\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-626873e9-0c5fdf1b0c8e1f21452df988\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"78.145.225.121\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
 ```
 
 In this respect, it may be used as a performant and lightweight method
@@ -594,7 +594,7 @@ This is available in system package repositories as:
 A system installation of ‘libnng’ in the standard filesystem locations
 will be detected and used if possible.
 
-Otherwise, a suitable recent version of ‘libnng’ will be downloaded and
+Otherwise, the latest release version of ‘libnng’ will be downloaded and
 built from source automatically during package installation (note: this
 requires ‘cmake’).
 

configure

@@ -14,7 +14,7 @@ if [ "$NANONEXT_ARM" ]; then
   PKG_LIBS="$PKG_LIBS -latomic"
 fi
 PKG_CFLAGS=""
-LIB_VER="722bf46"
+LIB_VER="169221d"
 SYS_LIB=0
 
 # Check for custom locations

src/core.c

@@ -995,7 +995,7 @@ SEXP rnng_recv(SEXP socket, SEXP mode, SEXP block, SEXP keep) {
   mode = rnng_matcharg(mode);
   const int mod = *INTEGER(mode), kpr = *LOGICAL(keep);
   int xc;
-  unsigned char *buf;
+  void *buf;
   size_t sz;
   nng_aio *aiop;
   SEXP res;
@@ -1005,7 +1005,7 @@ SEXP rnng_recv(SEXP socket, SEXP mode, SEXP block, SEXP keep) {
     xc = blk ? nng_recv(*sock, &buf, &sz, 1u): nng_recv(*sock, &buf, &sz, 3u);
     if (xc)
       return mk_error(xc);
-    res = nano_decode(buf, sz, mod, kpr);
+    res = nano_decode((unsigned char *) buf, sz, mod, kpr);
     nng_free(buf, sz);
 
   } else {
@@ -1022,9 +1022,8 @@ SEXP rnng_recv(SEXP socket, SEXP mode, SEXP block, SEXP keep) {
       return mk_error(xc);
     }
     nng_msg *msgp = nng_aio_get_msg(aiop);
-    buf = (unsigned char *) nng_msg_body(msgp);
     sz = nng_msg_len(msgp);
-    res = nano_decode(buf, sz, mod, kpr);
+    res = nano_decode((unsigned char *) nng_msg_body(msgp), sz, mod, kpr);
     nng_msg_free(msgp);
     nng_aio_free(aiop);
   }
@@ -1187,7 +1186,7 @@ SEXP rnng_stream_recv(SEXP stream, SEXP mode, SEXP timeout, SEXP keep, SEXP byte
 
   mode = rnng_matchargs(mode);
   const int mod = *INTEGER(mode), kpr = *LOGICAL(keep);
-  const size_t xlen = Rf_asInteger(bytes);
+  const size_t xlen = (size_t) Rf_asInteger(bytes);
   nng_duration dur;
   int xc;
   nng_iov iov;

tools/winlibs.R

@@ -1,13 +1,12 @@
 # nanonext - Download precompiled libnng for Windows ---------------------------
 
-if (!file.exists("../windows/rwinlib-1.6.0-pre/include/nng.h")) {
+if (!file.exists("../windows/rwinlib-1.5.2/include/nng.h")) {
 
   if (getRversion() < "3.3.0") setInternet2()
-  download.file("https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.6.0-pre.zip", destfile = "nng-1.6.0-pre.zip", quiet = TRUE)
+  download.file("https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.5.2.zip", destfile = "nng-1.5.2.zip", quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)
-  unzip("nng-1.6.0-pre.zip", exdir = "../windows")
-  unlink("nng-1.6.0-pre.zip")
+  unzip("nng-1.5.2.zip", exdir = "../windows")
+  unlink("nng-1.5.2.zip")
 
 }
 
-# cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -G "MSYS Makefiles" -DNNG_ELIDE_DEPRECATED=1 -DNNG_TESTS=0 -DNNG_TOOLS=0 ..