tidying async code

Author: shikokuchuo

R/aio.R

@@ -12,22 +12,22 @@
 #' @return The passed Aio object (invisibly), or NULL if non-blocking and the
 #'     Aio has yet to resolve.
 #'
-#' @details To access the values directly, use for example on a sendAio 'x':
-#'     \code{call_aio(x)$result}.
+#' @details For a 'recvAio', the received raw vector will be attached in \code{$raw}
+#'     (unless 'keep.raw' was set to FALSE when receiving), and the converted R
+#'     object in \code{$data}.
 #'
 #'     For a 'sendAio', the send result will be attached to the Aio in \code{$result}.
 #'     This will be zero on success.
 #'
-#'     For a 'recvAio', the received raw vector will be attached in \code{$raw}
-#'     (unless 'keep.raw' was set to FALSE when receiving), and the converted R
-#'     object in \code{$data}.
+#'     To access the values directly, use for example on a sendAio 'x':
+#'     \code{call_aio(x)$result}.
 #'
 #'     For a 'recvAio', in case of an error in unserialisation or data conversion,
 #'     the received raw vector will always be saved in \code{$raw} to allow the
 #'     data to be recovered.
 #'
-#'     Once the result is retrieved, the Aio is deallocated and only the result
-#'     is stored in the Aio object.
+#'     Once the result has been successfully retrieved, the Aio is deallocated
+#'     and only the result is stored in the Aio object.
 #'
 #' @section Non-blocking:
 #'
@@ -68,11 +68,11 @@ call_aio <- function(aio, block = TRUE) {
 
     if (inherits(aio, "recvAio")) {
 
-      if (!missing(block) && !isTRUE(block)) {
+      if (missing(block) || isTRUE(block)) {
+        res <- .Call(rnng_aio_wait_get_msg, .subset2(aio, "aio"))
+      } else {
         res <- .Call(rnng_aio_get_msg, .subset2(aio, "aio"))
         missing(res) && return()
-      } else {
-        res <- .Call(rnng_aio_wait_get_msg, .subset2(aio, "aio"))
       }
       mode <- .subset2(aio, "callparams")[[1L]]
       keep.raw <- .subset2(aio, "callparams")[[2L]]
@@ -99,11 +99,11 @@ call_aio <- function(aio, block = TRUE) {
 
     } else if (inherits(aio, "sendAio")) {
 
-      if (!missing(block) && !isTRUE(block)) {
+      if (missing(block) || isTRUE(block)) {
+        res <- .Call(rnng_aio_wait_result, .subset2(aio, "aio"))
+      } else {
         res <- .Call(rnng_aio_result, .subset2(aio, "aio"))
         missing(res) && return()
-      } else {
-        res <- .Call(rnng_aio_wait_result, .subset2(aio, "aio"))
       }
       aio[["result"]] <- res
       rm("aio", envir = aio)

R/context.R

@@ -313,14 +313,14 @@ request <- function(context,
     message(res, " : ", nng_error(res))
     return(invisible(res))
   }
-  aio <- .Call(rnng_recv_aio, context, timeout)
-  env <- `class<-`(new.env(), "recvAio")
-  env[["aio"]] <- aio
-  if (is.integer(aio)) {
-    message(aio, " : ", nng_error(aio))
-  } else {
-    env[["callparams"]] <- list(recv_mode, missing(keep.raw) || isTRUE(keep.raw))
+  res <- .Call(rnng_recv_aio, context, timeout)
+  is.integer(res) && {
+    message(res, " : ", nng_error(res))
+    return(invisible(res))
   }
+  env <- `class<-`(new.env(), "recvAio")
+  env[["aio"]] <- res
+  env[["callparams"]] <- list(recv_mode, missing(keep.raw) || isTRUE(keep.raw))
   env
 
 }

man/call_aio.Rd

@@ -306,13 +306,8 @@ SEXP rnng_ctx_send(SEXP context, SEXP data, SEXP timeout) {
   xc = nng_msg_alloc(&msgp, 0);
   if (xc)
     return Rf_ScalarInteger(xc);
-  xc = nng_msg_append(msgp, dp, xlen);
-  if (xc) {
-    nng_msg_free(msgp);
-    return Rf_ScalarInteger(xc);
-  }
-  xc = nng_aio_alloc(&aiop, NULL, NULL);
-  if (xc) {
+  if ((xc = nng_msg_append(msgp, dp, xlen)) ||
+      (xc = nng_aio_alloc(&aiop, NULL, NULL))) {
     nng_msg_free(msgp);
     return Rf_ScalarInteger(xc);
   }

src/core.c

@@ -37,9 +37,11 @@ suppressMessages(n1$send("test", mode = "raw", block = FALSE, echo = FALSE))
 invisible(suppressMessages(n$recv("character", block = FALSE)))
 saio <- suppressMessages(n$send_aio(data.frame(), timeout = 500))
 invisible(!is.null(saio[["aio"]]) || stop())
+invisible(suppressMessages(call_aio(saio, block = FALSE)))
 raio <- suppressMessages(n1$recv_aio(timeout = 500))
 invisible(!is.null(raio[["aio"]]) || stop())
 invisible(is.list(raio[["callparams"]]) || stop())
+invisible(suppressMessages(call_aio(raio, block = FALSE)))
 suppressMessages(n$send_aio(c(1.1, 2.2), mode = "raw", timeout = 500))
 invisible(suppressMessages(n1$recv_aio(timeout = 500)))
 
@@ -90,4 +92,5 @@ invisible(close(sock) == 0L || stop())
 
 invisible(is.character(ver <- nng_version()) && length(ver) == 2L || stop())
 invisible(is.character(nng_error(0L)) || stop())
+invisible(is_nul_byte(as.raw(0L)) && !is_nul_byte(NULL) || stop())