Produce only interrupt warning on interrupts; happened also on errors

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.apply
-Version: 1.11.3-9013
+Version: 1.11.3-9014
 Title: Apply Function to Elements in Parallel using Futures
 Depends:
     R (>= 3.2.0),

NEWS.md

@@ -24,12 +24,6 @@
    requires. Use of a string has been deprecated since
    **future.apply** 1.10.0 (2022-11-04).
 
- * Use of `...` as global variables is now considered a mistake. For
-   example, instead of `f <- function(X, ...)  future_lapply(X,
-   function(x) sum(x, ...))`, use `f <- function(X, ...)
-   future_lapply(X, function(x, ...) sum(x, ...), ...)` such that
-   `...` is passed as arguments.
- 
 
 # Version 1.11.3 [2024-10-27]
 

R/future_lapply.R

@@ -209,13 +209,13 @@ future_lapply <- local({
       expr_FUN <- quote({
         ...future.FUN(...future.X_jj)
       })
-      if (debug) mdebugf("  => Will not pass '...' to FUN(): %s", deparse(expr_FUN))
+      if (debug) mdebugf("  => Will not pass '...' to FUN(): %s", commaq(deparse(expr_FUN)))
     } else {
       ## No; okay to pass '...' to FUN()
       expr_FUN <- quote({
         ...future.FUN(...future.X_jj, ...)
       })
-      if (debug) mdebugf("  => Will pass '...' to FUN(): %s", deparse(expr_FUN))
+      if (debug) mdebugf("  => Will pass '...' to FUN(): %s", commaq(deparse(expr_FUN)))
     }
 
     ## With or without RNG?

R/future_xapply.R

@@ -300,18 +300,20 @@ future_xapply <- local({
         }) ## withCallingHandlers()
       } else {
         ## value() exits early if it detects a future with an error.
-        ## In future (> 1.42.0), non-resolved futures will be automatically
-        ## interrupted if there's an error.
+        ## In future (> 1.40.0), non-resolved futures will be automatically
+        ## canceled if there's an error.
         value(fs)
       }
     }, interrupt = identity, error = identity) ## tryCatch()
 
     if (inherits(values, "interrupt") || inherits(values, "error")) {
-      when <- Sys.time()
-      host <- Sys.info()[["nodename"]]
-      pid <- Sys.getpid()
-      msg <- sprintf("%s() interrupted at %s, while running on %s (pid %s)", fcn_name, format(when, format = "%FT%T"), sQuote(host), pid)
-      warning(sprintf("%s. Cleaning up ...", msg), immediate. = TRUE, call. = FALSE)
+      if (inherits(values, "interrupt")) {
+        when <- Sys.time()
+        host <- Sys.info()[["nodename"]]
+        pid <- Sys.getpid()
+        msg <- sprintf("%s() interrupted at %s, while running on %s (pid %s)", fcn_name, format(when, format = "%FT%T"), sQuote(host), pid)
+        warning(sprintf("%s. Cleaning up ...", msg), immediate. = TRUE, call. = FALSE)
+      }
 
       ## Interrupt all futures
       fs <- cancel(fs)