simplifications

Author: shikokuchuo

DESCRIPTION

@@ -36,6 +36,7 @@ LinkingTo:
     later
 Suggests: 
     knitr,
-    markdown
+    markdown,
+    promises
 VignetteBuilder: knitr
 RoxygenNote: 7.3.1

R/aio.R

@@ -120,8 +120,8 @@ recv_aio <- function(con,
                      n = 65536L)
   data <- .Call(rnng_recv_aio, con, mode, timeout, n, environment(),
     function() {
-      cb <- data$callback
-      if (!is.null(cb)) {
+      cb <- .subset2(data, "callback")
+      if (is.function(cb)) {
         cb(data)
       }
     }
@@ -166,8 +166,8 @@ recv_aio_signal <- function(con,
                             n = 65536L)
   data <- .Call(rnng_recv_aio_signal, con, cv, mode, timeout, n, environment(),
     function() {
-      cb <- data$callback
-      if (!is.null(cb)) {
+      cb <- .subset2(data, "callback")
+      if (is.function(cb)) {
         cb(data)
       }
     }
@@ -180,14 +180,15 @@ is.promising.recvAio <- function(x) {
 
 #' @exportS3Method promises::as.promise
 as.promise.recvAio <- function(x) {
-  prom <- x$promise
 
-  if (is.null(prom)) {
-    prom <- promises::promise(function(resolve, reject) {
+  promise <- .subset2(x, "promise")
+
+  if (is.null(promise)) {
+    promise <- promises::promise(function(resolve, reject) {
       assign("callback", function(...) {
 
         # WARNING: x$data is heavily side-effecty!
-        value <- x$data
+        value <- .subset2(x, "data")
 
         if (is_error_value(value)) {
           reject(simpleError(nng_error(value)))
@@ -202,19 +203,20 @@ as.promise.recvAio <- function(x) {
 
     if (!inherits(value, "unresolvedValue")) {
       if (is_error_value(value)) {
-        prom <- promises::promise_reject(simpleError(nng_error(value)))
+        promise <- promises::promise_reject(simpleError(nng_error(value)))
       } else {
-        prom <- promises::promise_resolve(value)
+        promise <- promises::promise_resolve(value)
       }
     }
 
     # Save for next time. This is not just an optimization but essential for
     # correct behavior if as.promise is called multiple times, because only one
     # `callback` can exist on the recvAio object at a time.
-    assign("promise", prom, x)
+    assign("promise", promise, x)
   }
 
-  prom
+  promise
+
 }
 
 # Core aio functions -----------------------------------------------------------

src/aio.c

@@ -196,19 +196,12 @@ static void isaio_complete(void *arg) {
 
 }
 
-
-static void raio_invoke_cb(void* arg) {
+static void raio_invoke_cb(void *arg) {
   nano_aio *raio = (nano_aio *) arg;
-  if (raio->cb == NULL || Rf_isNull(raio->cb)) return;
-  SEXP func = (SEXP)raio->cb;
-  SEXP callExpr, result;
-  if (!Rf_isNull(func)) {
-    PROTECT(callExpr = Rf_lcons(func, R_NilValue)); // Prepare call
-    PROTECT(result = Rf_eval(callExpr, R_GlobalEnv)); // Execute call
-
-    UNPROTECT(2);
-    R_ReleaseObject(func);
-  }
+  SEXP callExpr;
+  PROTECT(callExpr = Rf_lcons((SEXP) raio->cb, R_NilValue));
+  (void) Rf_eval(callExpr, R_GlobalEnv);
+  UNPROTECT(1);
 }
 
 static void raio_complete(void *arg) {
@@ -743,12 +736,7 @@ SEXP rnng_recv_aio_impl(const SEXP con, const SEXP mode, const SEXP timeout,
     raio->next = ncv;
     raio->type = RECVAIO;
     raio->mode = mod;
-    if (Rf_isNull(cb)) {
-      raio->cb = NULL;
-    } else {
-      R_PreserveObject(cb);
-      raio->cb = (void*)cb;
-    }
+    raio->cb = cb;
 
     if ((xc = nng_aio_alloc(&raio->aio, signal ? raio_complete_signal : raio_complete, raio)))
       goto exitlevel1;

src/init.c

@@ -155,8 +155,8 @@ static const R_CallMethodDef callMethods[] = {
   {"rnng_random", (DL_FUNC) &rnng_random, 2},
   {"rnng_reap", (DL_FUNC) &rnng_reap, 1},
   {"rnng_recv", (DL_FUNC) &rnng_recv, 4},
-  {"rnng_recv_aio", (DL_FUNC) &rnng_recv_aio, 5},
-  {"rnng_recv_aio_signal", (DL_FUNC) &rnng_recv_aio_signal, 6},
+  {"rnng_recv_aio", (DL_FUNC) &rnng_recv_aio, 6},
+  {"rnng_recv_aio_signal", (DL_FUNC) &rnng_recv_aio_signal, 7},
   {"rnng_request", (DL_FUNC) &rnng_request, 6},
   {"rnng_request_signal", (DL_FUNC) &rnng_request_signal, 7},
   {"rnng_send", (DL_FUNC) &rnng_send, 4},