safer and more efficient to release cb object in request finalizer

Author: shikokuchuo

NEWS.md

@@ -1,7 +1,12 @@
 # nanonext 0.13.6.9002 (development)
 
+#### New Features
+
 * Integrates with the `later` package to provide the foundation for truly event-driven (non-polling) promises (thanks @jcheng5 for the initial prototype in #28), where side-effects are enacted asynchronously upon aio completion.
 * Adds `request2()` for creating a request that may be turned into an event-driven promise.
+
+#### Updates
+
 * Updates minimum 'libnng' version requirement to v1.6.0 (if a suitable system-installed version is not found, the bundled version is compiled from source).
 
 # nanonext 0.13.6

src/aio.c

@@ -232,17 +232,11 @@ static void request_complete_signal(void *arg) {
 
 }
 
-static void release_object(void *data, Rboolean jump) {
-  if (jump)
-    R_ReleaseObject((SEXP) data);
-}
-
 static void raio_invoke_cb(void *arg) {
-  SEXP call, env = (SEXP) arg;
-  PROTECT(call = Rf_lcons(CADR(ATTRIB(env)), R_NilValue));
-  (void) R_UnwindProtect(eval_safe, call, release_object, env, NULL);
+  SEXP call, cb = (SEXP) arg;
+  PROTECT(call = Rf_lcons(cb, R_NilValue));
+  (void) Rf_eval(call, R_GlobalEnv);
   UNPROTECT(1);
-  R_ReleaseObject(env);
 }
 
 static void raio_complete_cb(void *arg) {
@@ -254,8 +248,9 @@ static void raio_complete_cb(void *arg) {
   raio->result = res - !res;
 
   nano_aio *saio = (nano_aio *) raio->next;
-  if (CADR(ATTRIB((SEXP) saio->data)) != R_NilValue)
-    later2(raio_invoke_cb, saio->data, 0);
+  SEXP ax = CADR(ATTRIB((SEXP) saio->data));
+  if (ax != R_NilValue)
+    later2(raio_invoke_cb, ax, 0);
 
 }
 
@@ -277,8 +272,9 @@ static void request_complete_cb(void *arg) {
   nng_cv_wake(cv);
   nng_mtx_unlock(mtx);
 
-  if (CADR(ATTRIB((SEXP) saio->data)) != R_NilValue)
-    later2(raio_invoke_cb, saio->data, 0);
+  SEXP ax = CADR(ATTRIB((SEXP) saio->data));
+  if (ax != R_NilValue)
+    later2(raio_invoke_cb, ax, 0);
 
 }
 
@@ -338,6 +334,8 @@ static void request_finalizer(SEXP xptr) {
   nng_aio_free(xp->aio);
   if (xp->data != NULL)
     nng_msg_free((nng_msg *) xp->data);
+  if (saio->data != NULL)
+    R_ReleaseObject((SEXP) saio->data);
   R_Free(saio);
   R_Free(xp);
 

src/core.c

@@ -42,12 +42,13 @@ SEXP mk_error(const int xc) {
 
 }
 
-SEXP eval_safe (void *call) {
+static SEXP eval_safe (void *call) {
   return Rf_eval((SEXP) call, R_GlobalEnv);
 }
 
 static void rl_reset(void *data, Rboolean jump) {
-  if (jump && data == NULL)
+  (void) data;
+  if (jump)
     SET_TAG(nano_refHook, R_NilValue);
 }
 

src/nanonext.h

@@ -184,7 +184,6 @@ typedef struct nano_buf_s {
 
 SEXP mk_error(const int);
 SEXP mk_error_ncurl(const int);
-SEXP eval_safe(void *);
 nano_buf nano_char_buf(const SEXP);
 SEXP nano_decode(unsigned char *, const size_t, const int);
 void nano_encode(nano_buf *, const SEXP);