C code style

Author: shikokuchuo

NEWS.md

@@ -7,6 +7,7 @@
 
 #### Updates
 
+* For receives, if an error occurs in unserialisation or data conversion (e.g. mode was incorrectly specified), the received raw vector is now available at both `$raw` and `$data` if `keep.raw = TRUE`.
 * 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.
 * All-round internal performance optimisations.

README.md

@@ -379,7 +379,7 @@ aio
 #> < recvAio >
 #>  - $data for message data
 aio$data |> str()
-#>  num [1:100000000] 0.112 0.003 2.633 -0.609 -0.476 ...
+#>  num [1:100000000] 0.1703 -0.0154 0.0138 -0.3083 -0.1477 ...
 ```
 
 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 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
+#>  [76] 2d 36 32 36 39 34 30 66 39 2d 32 37 38 31 35 33 34 36 36 61 31 61 35 38 35
+#> [101] 35 30 39 38 34 30 66 35 62 22 0a 20 20 7d 0a 7d 0a
 #> 
 #> $data
-#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-626873e9-6f3722942a41916505718531\"\n  }\n}\n"
+#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-626940f9-278153466a1a585509840f5b\"\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-626873e9-0c5fdf1b0c8e1f21452df988\"\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-626940f9-73f729e64784f75507dcee00\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"79.173.189.204\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
 ```
 
 In this respect, it may be used as a performant and lightweight method

src/aio.c

@@ -180,11 +180,11 @@ SEXP rnng_aio_get_msg(SEXP aio, SEXP mode, SEXP keep) {
   if (res)
     return mk_error(res);
 
-  const int mod = *INTEGER(mode), kpr = *LOGICAL(keep);
+  const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   void *buf = nng_msg_body(raio->data);
   size_t sz = nng_msg_len(raio->data);
 
-  return nano_decode((unsigned char *) buf, sz, mod, kpr);
+  return nano_decode(buf, sz, mod, kpr);
 
 }
 
@@ -208,11 +208,11 @@ SEXP rnng_aio_stream_in(SEXP aio, SEXP mode, SEXP keep) {
   if (res)
     return mk_error(res);
 
-  const int mod = *INTEGER(mode), kpr = *LOGICAL(keep);
+  const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   nng_iov *iov = (nng_iov *) iaio->data;
   size_t sz = nng_aio_count(iaio->aio);
 
-  return nano_decode((unsigned char *) iov->iov_buf, sz, mod, kpr);
+  return nano_decode(iov->iov_buf, sz, mod, kpr);
 
 }
 
@@ -647,9 +647,7 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP method, SEXP headers, SEXP data) {
   }
   if (headers != R_NilValue) {
     R_xlen_t hlen = Rf_xlength(headers);
-    SEXP names;
-    PROTECT(names = Rf_getAttrib(headers, R_NamesSymbol));
-
+    SEXP names = Rf_getAttrib(headers, R_NamesSymbol);
     switch (TYPEOF(headers)) {
     case STRSXP:
       for (R_xlen_t i = 0; i < hlen; i++) {
@@ -662,7 +660,6 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP method, SEXP headers, SEXP data) {
           nng_url_free(handle->url);
           R_Free(handle);
           R_Free(haio);
-          UNPROTECT(1);
           return mk_error(xc);
         }
       }
@@ -678,18 +675,15 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP method, SEXP headers, SEXP data) {
           nng_url_free(handle->url);
           R_Free(handle);
           R_Free(haio);
-          UNPROTECT(1);
           return mk_error(xc);
         }
       }
       break;
     }
-
-    UNPROTECT(1);
   }
   if (data != R_NilValue) {
     unsigned char *dp = RAW(data);
-    const size_t dlen = (size_t) Rf_xlength(data) - 1;
+    const size_t dlen = Rf_xlength(data) - 1;
     xc = nng_http_req_set_data(handle->req, dp, dlen);
     if (xc) {
       nng_http_req_free(handle->req);
@@ -804,7 +798,7 @@ SEXP rnng_aio_http(SEXP aio) {
 
   nng_http_res_get_data(handle->res, &dat, &sz);
   vec = Rf_allocVector(RAWSXP, sz);
-  memcpy(RAW(vec), (unsigned char *) dat, sz);
+  memcpy(RAW(vec), dat, sz);
 
   return vec;
 

src/core.c

@@ -82,7 +82,7 @@ SEXP rnng_serial(SEXP mode) {
 SEXP nano_encode(SEXP object) {
 
   R_xlen_t xlen = Rf_xlength(object);
-  unsigned char *buf;
+  void *buf;
   size_t sz;
   SEXP out;
 
@@ -105,25 +105,25 @@ SEXP nano_encode(SEXP object) {
   } else {
     switch (TYPEOF(object)) {
     case REALSXP:
-      buf = (unsigned char *) REAL(object);
+      buf = REAL(object);
       sz = xlen * sizeof(double);
       out = Rf_allocVector(RAWSXP, sz);
       memcpy(RAW(out), buf, sz);
       break;
     case INTSXP:
-      buf = (unsigned char *) INTEGER(object);
+      buf = INTEGER(object);
       sz = xlen * sizeof(int);
       out = Rf_allocVector(RAWSXP, sz);
       memcpy(RAW(out), buf, sz);
       break;
     case LGLSXP:
-      buf = (unsigned char *) LOGICAL(object);
+      buf = LOGICAL(object);
       sz = xlen * sizeof(int);
       out = Rf_allocVector(RAWSXP, sz);
       memcpy(RAW(out), buf, sz);
       break;
     case CPLXSXP:
-      buf = (unsigned char *) COMPLEX(object);
+      buf = COMPLEX(object);
       sz = xlen * (sizeof(double) + sizeof(double));
       out = Rf_allocVector(RAWSXP, sz);
       memcpy(RAW(out), buf, sz);
@@ -478,7 +478,7 @@ SEXP rnng_matchargs(SEXP mode) {
 
 }
 
-SEXP nano_decode(unsigned char *buf, size_t sz, const int mod, const int kpr) {
+SEXP nano_decode(void *buf, size_t sz, const int mod, const int kpr) {
 
   int tryErr = 0;
   SEXP raw, data;
@@ -491,7 +491,6 @@ SEXP nano_decode(unsigned char *buf, size_t sz, const int mod, const int kpr) {
     data = R_tryEval(expr, R_BaseEnv, &tryErr);
     if (tryErr) {
       data = raw;
-      raw = R_NilValue;
     }
     UNPROTECT(2);
   } else if (mod == 2) {
@@ -506,26 +505,62 @@ SEXP nano_decode(unsigned char *buf, size_t sz, const int mod, const int kpr) {
     SETLENGTH(data, m);
     UNPROTECT(1);
   } else {
+    size_t size;
     switch (mod) {
     case 3:
-      data = Rf_allocVector(CPLXSXP, sz / (sizeof(double) + sizeof(double)));
-      memcpy(COMPLEX(data), buf, sz);
+      size = sizeof(double) + sizeof(double);
+      if (sz % size == 0) {
+        data = Rf_allocVector(CPLXSXP, sz / size);
+        memcpy(COMPLEX(data), buf, sz);
+      } else {
+        Rf_warning("received data could not be converted to complex");
+        data = Rf_allocVector(RAWSXP, sz);
+        memcpy(RAW(data), buf, sz);
+      }
       break;
     case 4:
-      data = Rf_allocVector(REALSXP, sz / sizeof(double));
-      memcpy(REAL(data), buf, sz);
+      size = sizeof(double);
+      if (sz % size == 0) {
+        data = Rf_allocVector(REALSXP, sz / size);
+        memcpy(REAL(data), buf, sz);
+      } else {
+        Rf_warning("received data could not be converted to double");
+        data = Rf_allocVector(RAWSXP, sz);
+        memcpy(RAW(data), buf, sz);
+      }
       break;
     case 5:
-      data = Rf_allocVector(INTSXP, sz / sizeof(int));
-      memcpy(INTEGER(data), buf, sz);
+      size = sizeof(int);
+      if (sz % size == 0) {
+        data = Rf_allocVector(INTSXP, sz / size);
+        memcpy(INTEGER(data), buf, sz);
+      } else {
+        Rf_warning("received data could not be converted to integer");
+        data = Rf_allocVector(RAWSXP, sz);
+        memcpy(RAW(data), buf, sz);
+      }
       break;
     case 6:
-      data = Rf_allocVector(LGLSXP, sz / sizeof(int));
-      memcpy(LOGICAL(data), buf, sz);
+      size = sizeof(int);
+      if (sz % size == 0) {
+        data = Rf_allocVector(LGLSXP, sz / size);
+        memcpy(LOGICAL(data), buf, sz);
+      } else {
+        Rf_warning("received data could not be converted to logical");
+        data = Rf_allocVector(RAWSXP, sz);
+        memcpy(RAW(data), buf, sz);
+      }
       break;
     case 7:
-      data = Rf_allocVector(REALSXP, sz / sizeof(double));
-      memcpy(REAL(data), buf, sz);
+      size = sizeof(double);
+      if (sz % size == 0) {
+        data = Rf_allocVector(REALSXP, sz / size);
+        memcpy(REAL(data), buf, sz);
+      } else {
+        Rf_warning("received data could not be converted to numeric");
+        data = Rf_allocVector(RAWSXP, sz);
+        memcpy(RAW(data), buf, sz);
+      }
       break;
     case 8:
       data = Rf_allocVector(RAWSXP, sz);
@@ -606,7 +641,7 @@ void context_finalizer(SEXP xptr) {
 
 SEXP rnng_protocol_open(SEXP protocol) {
 
-  const int pro = *INTEGER(protocol);
+  const int pro = INTEGER(protocol)[0];
   nng_socket *sock;
   char *pname;
   int xc;
@@ -944,7 +979,7 @@ SEXP rnng_send(SEXP socket, SEXP data, SEXP block, SEXP echo) {
   nng_socket *sock = (nng_socket *) R_ExternalPtrAddr(socket);
 
   const nng_duration blk = (nng_duration) Rf_asInteger(block);
-  const int ech = *LOGICAL(echo);
+  const int ech = LOGICAL(echo)[0];
   int xc;
   nng_msg *msgp;
   nng_aio *aiop;
@@ -993,19 +1028,19 @@ SEXP rnng_recv(SEXP socket, SEXP mode, SEXP block, SEXP keep) {
   nng_socket *sock = (nng_socket *) R_ExternalPtrAddr(socket);
 
   mode = rnng_matcharg(mode);
-  const int mod = *INTEGER(mode), kpr = *LOGICAL(keep);
+  const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   int xc;
   void *buf;
   size_t sz;
   nng_aio *aiop;
   SEXP res;
 
   if (TYPEOF(block) == LGLSXP) {
-    const int blk = *LOGICAL(block);
+    const int blk = LOGICAL(block)[0];
     xc = blk ? nng_recv(*sock, &buf, &sz, 1u): nng_recv(*sock, &buf, &sz, 3u);
     if (xc)
       return mk_error(xc);
-    res = nano_decode((unsigned char *) buf, sz, mod, kpr);
+    res = nano_decode(buf, sz, mod, kpr);
     nng_free(buf, sz);
 
   } else {
@@ -1024,7 +1059,7 @@ SEXP rnng_recv(SEXP socket, SEXP mode, SEXP block, SEXP keep) {
     nng_msg *msgp = nng_aio_get_msg(aiop);
     buf = nng_msg_body(msgp);
     sz = nng_msg_len(msgp);
-    res = nano_decode((unsigned char *) buf, sz, mod, kpr);
+    res = nano_decode(buf, sz, mod, kpr);
     nng_msg_free(msgp);
     nng_aio_free(aiop);
   }
@@ -1039,14 +1074,14 @@ SEXP rnng_ctx_send(SEXP context, SEXP data, SEXP timeout, SEXP echo) {
     error_return("'con' is not a valid Context");
   nng_ctx *ctxp = (nng_ctx *) R_ExternalPtrAddr(context);
 
-  const int ech = *LOGICAL(echo);
+  const int ech = LOGICAL(echo)[0];
   nng_duration dur;
   int xc;
   nng_msg *msgp;
   nng_aio *aiop;
 
   if (TYPEOF(timeout) == LGLSXP) {
-    const int blk = *LOGICAL(timeout);
+    const int blk = LOGICAL(timeout)[0];
     dur = blk ? -2 : 0;
   } else {
     dur = (nng_duration) Rf_asInteger(timeout);
@@ -1089,14 +1124,14 @@ SEXP rnng_ctx_recv(SEXP context, SEXP mode, SEXP timeout, SEXP keep) {
   nng_duration dur;
 
   mode = rnng_matcharg(mode);
-  const int mod = *INTEGER(mode), kpr = *LOGICAL(keep);
+  const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   int xc;
   void *buf;
   size_t sz;
   SEXP res;
 
   if (TYPEOF(timeout) == LGLSXP) {
-    const int blk = *LOGICAL(timeout);
+    const int blk = LOGICAL(timeout)[0];
     dur = blk ? -2 : 0;
   } else {
     dur = (nng_duration) Rf_asInteger(timeout);
@@ -1118,7 +1153,7 @@ SEXP rnng_ctx_recv(SEXP context, SEXP mode, SEXP timeout, SEXP keep) {
   nng_msg *msgp = nng_aio_get_msg(aiop);
   buf = nng_msg_body(msgp);
   sz = nng_msg_len(msgp);
-  res = nano_decode((unsigned char *) buf, sz, mod, kpr);
+  res = nano_decode(buf, sz, mod, kpr);
   nng_msg_free(msgp);
   nng_aio_free(aiop);
 
@@ -1132,14 +1167,14 @@ SEXP rnng_stream_send(SEXP stream, SEXP data, SEXP timeout, SEXP echo) {
     error_return("'con' is not a valid Stream");
   nng_stream *sp = (nng_stream *) R_ExternalPtrAddr(stream);
 
-  const int ech = *LOGICAL(echo);
+  const int ech = LOGICAL(echo)[0];
   nng_duration dur;
   int xc;
   nng_iov iov;
   nng_aio *aiop;
 
   if (TYPEOF(timeout) == LGLSXP) {
-    const int blk = *LOGICAL(timeout);
+    const int blk = LOGICAL(timeout)[0];
     dur = blk ? -2 : 0;
   } else {
     dur = (nng_duration) Rf_asInteger(timeout);
@@ -1148,7 +1183,7 @@ SEXP rnng_stream_send(SEXP stream, SEXP data, SEXP timeout, SEXP echo) {
   const R_xlen_t xlen = Rf_xlength(enc);
   unsigned char *dp = RAW(enc);
 
-  const int frames = *LOGICAL(Rf_getAttrib(stream, nano_TextframesSymbol));
+  const int frames = LOGICAL(Rf_getAttrib(stream, nano_TextframesSymbol))[0];
   iov.iov_len = frames == 1 ? xlen - 1 : xlen;
   iov.iov_buf = dp;
 
@@ -1186,7 +1221,7 @@ SEXP rnng_stream_recv(SEXP stream, SEXP mode, SEXP timeout, SEXP keep, SEXP byte
   nng_stream *sp = (nng_stream *) R_ExternalPtrAddr(stream);
 
   mode = rnng_matchargs(mode);
-  const int mod = *INTEGER(mode), kpr = *LOGICAL(keep);
+  const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   const size_t xlen = (size_t) Rf_asInteger(bytes);
   nng_duration dur;
   int xc;
@@ -1196,7 +1231,7 @@ SEXP rnng_stream_recv(SEXP stream, SEXP mode, SEXP timeout, SEXP keep, SEXP byte
   SEXP res;
 
   if (TYPEOF(timeout) == LGLSXP) {
-    const int blk = *LOGICAL(timeout);
+    const int blk = LOGICAL(timeout)[0];
     dur = blk ? -2 : 0;
   } else {
     dur = (nng_duration) Rf_asInteger(timeout);
@@ -1230,7 +1265,7 @@ SEXP rnng_stream_recv(SEXP stream, SEXP mode, SEXP timeout, SEXP keep, SEXP byte
   }
 
   sz = nng_aio_count(aiop);
-  res = nano_decode((unsigned char *) iov.iov_buf, sz, mod, kpr);
+  res = nano_decode(iov.iov_buf, sz, mod, kpr);
   nng_aio_free(aiop);
   R_Free(iov.iov_buf);