Safer interrupts

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.9001
 Authors@R: c(
     person("Charlie", "Gao", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-0750-061X")),

src/aio.c

@@ -149,9 +149,8 @@ static void raio_complete_interrupt(void *arg) {
 
   if (res <= 0) {
 #ifdef _WIN32
-    UserBreak = 1;
+    GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0);
 #else
-    R_interrupts_pending = 1;
     kill(getpid(), SIGINT);
 #endif
   }

src/nanonext.h

@@ -63,6 +63,9 @@ typedef struct nano_handle_s {
 #ifdef NANONEXT_SIGNALS
 #ifndef _WIN32
 #include <unistd.h>
+#else
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #endif
 #include <signal.h>
 #endif
@@ -95,13 +98,6 @@ typedef struct nano_handle_s {
 #include <Rinternals.h>
 #include <Rversion.h>
 #include <R_ext/Visibility.h>
-#if defined(NANONEXT_SIGNALS)
-#ifdef _WIN32
-#include <Rembedded.h>
-#else
-extern int R_interrupts_pending;
-#endif
-#endif
 
 #define NANO_PTR(x) (void *) CAR(x)
 #define NANO_PTR_CHECK(x, tag) (TAG(x) != tag || NANO_PTR(x) == NULL)

src/sync.c

@@ -151,8 +151,6 @@ void pipe_cb_signal(nng_pipe p, nng_pipe_ev ev, void *arg) {
 #ifdef _WIN32
     raise(sig);
 #else
-    if (sig == SIGINT)
-      R_interrupts_pending = 1;
     kill(getpid(), sig);
 #endif