stop_aio() now resets the R interrupts state (#196)

* Add interrupt state reset

* Enable for Windows

* Polish docs

* Add news item

* Rename functions and add tests

* Remove separate interface and include within `stop_aio()`

* Add comment

* Make consistent for pipe connections

Author: shikokuchuo

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: nanonext
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 1.7.0.9000
+Version: 1.7.0.9002
 Authors@R: c(
     person("Charlie", "Gao", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-0750-061X")),

NAMESPACE

@@ -44,7 +44,6 @@ export("%~>%")
 export("opt<-")
 export(.advance)
 export(.context)
-export(.interrupt)
 export(.keep)
 export(.mark)
 export(.read_header)

NEWS.md

@@ -1,5 +1,9 @@
 # nanonext (development version)
 
+#### Updates
+
+* The `cv` arguments at `recv_aio()` and `request()` have been simplified.
+
 # nanonext 1.7.0
 
 #### Behavioural Changes

R/utils.R

@@ -401,19 +401,6 @@ ip_addr <- function() .Call(rnng_ip_addr)
 #'
 .read_marker <- function(x) .Call(rnng_marker_read, x)
 
-#' Interrupt Switch
-#'
-#' Internal package function. No longer used.
-#'
-#' @param x logical value.
-#'
-#' @return The logical value `x` supplied.
-#'
-#' @keywords internal
-#' @export
-#'
-.interrupt <- function(x = TRUE) x
-
 #' Internal Package Function
 #'
 #' Only present for cleaning up after running examples and tests. Do not attempt

man/dot-interrupt.Rd

@@ -456,6 +456,13 @@ SEXP rnng_aio_stop(SEXP x) {
     if (NANO_PTR_CHECK(coreaio, nano_AioSymbol)) break;
     nano_aio *aiop = (nano_aio *) NANO_PTR(coreaio);
     nng_aio_stop(aiop->aio);
+    // See #194, this is to reset the R interrupts state after an interrupt
+    // requested by `stop_request()` has already triggered
+#ifdef _WIN32
+    UserBreak = 0;
+#else
+    R_interrupts_pending = 0;
+#endif
     break;
   case VECSXP: ;
     const R_xlen_t xlen = Rf_xlength(x);

src/aio.c

@@ -149,6 +149,8 @@ void pipe_cb_signal(nng_pipe p, nng_pipe_ev ev, void *arg) {
   nng_mtx_unlock(mtx);
   if (sig > 1) {
 #ifdef _WIN32
+    if (sig == SIGINT)
+      UserBreak = 1;
     raise(sig);
 #else
     if (sig == SIGINT)

src/sync.c

@@ -649,8 +649,6 @@ if (promises) { later::run_now(1L); later::run_now() }
 test_type("character", ip_addr())
 test_type("character", names(ip_addr()))
 test_null(write_stdout(""))
-test_true(.interrupt())
-test_false(.interrupt(FALSE))
 test_false(identical(get0(".Random.seed"), {.advance(); .Random.seed}))
 test_type("integer", .Call(nanonext:::rnng_traverse_precious))