Merge pull request #149 from r-lib/fix-makeforkcluster

r-lib · May 19, 2021 · 9096d0c · 9096d0c
2 parents 5b8cc6b + 2535400
commit 9096d0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: later
 Type: Package
 Title: Utilities for Scheduling Functions to Execute Later with Event Loops
-Version: 1.2.0
+Version: 1.2.0.9000
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]"),
     person("Joe", "Cheng", role = c("aut"), email = "[email protected]"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+## later 1.2.0.9000
+
+* Closed #148: When later was attached, `parallel::makeForkCluster()` would fail. (#149)
+
 ## later 1.2.0
 
 * Closed #138: later is now licensed as MIT. (#139)

diff --git a/src/later_posix.cpp b/src/later_posix.cpp
@@ -173,6 +173,8 @@ void child_proc_after_fork() {
       close(pipe_out);
       pipe_out = -1;
     }
+
+    removeInputHandler(&R_InputHandlers, dummyInputHandlerHandle);
     if (dummy_pipe_in  > 0) {
       close(dummy_pipe_in);
       dummy_pipe_in  = -1;