Major internal redesign - step 2:

 * All of future's backends are now using evalFuture() directly.
   Other, existing backends will rely on getExpression() until updated.

Squashed commit of the following:

commit 5e5c70ec9c459385bf20a0976c2318aa43f8ae1f
Author: Henrik Bengtsson <[email protected]>
Date:   Fri Feb 14 16:54:11 2025 -0800

    Missing ) in help

commit 9058390
Author: Henrik Bengtsson <[email protected]>
Date:   Fri Feb 14 16:03:34 2025 -0800

    ClusterFuture/MultisessionFuture is now using evalFuture() directly

commit f9bcf57
Author: Henrik Bengtsson <[email protected]>
Date:   Fri Feb 14 15:51:03 2025 -0800

    MulticoreFuture is now using evalFuture() directly

commit 84e3a2a
Author: Henrik Bengtsson <[email protected]>
Date:   Fri Feb 14 12:17:19 2025 -0800

    CLEANUP: Drop argument 'envir' from evalFuture()

commit 92b3f09
Author: Henrik Bengtsson <[email protected]>
Date:   Fri Feb 14 12:15:34 2025 -0800

    UniprocessFuture is now using evalFuture() directly

commit 7dc6c97
Author: Henrik Bengtsson <[email protected]>
Date:   Fri Feb 14 11:55:48 2025 -0800

    Simplify evalFuture() further

commit 089608a
Author: Henrik Bengtsson <[email protected]>
Date:   Fri Feb 14 10:09:22 2025 -0800

    Regroup R/ files by renaming them

commit d1a5755
Author: Henrik Bengtsson <[email protected]>
Date:   Thu Feb 13 19:56:42 2025 -0800

    File cleanup: move utility functions to utils-*.R files

commit 8e726cb
Author: Henrik Bengtsson <[email protected]>
Date:   Thu Feb 13 12:20:55 2025 -0800

    More backend cleanups

commit cda1fda
Author: Henrik Bengtsson <[email protected]>
Date:   Thu Feb 13 08:39:22 2025 -0800

    Further cleanup of evalFuture() and backends

commit 0511461
Author: Henrik Bengtsson <[email protected]>
Date:   Tue Feb 11 19:15:28 2025 -0800

    Add internal getFutureCore(), getFutureCapture(), and getFutureContext()
    Separate future expression and backend packages

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.34.0-9126
+Version: 1.34.0-9134
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Imports:
     digest,

NAMESPACE

@@ -12,10 +12,11 @@ S3method(c,FutureGlobals)
 S3method(futures,environment)
 S3method(futures,list)
 S3method(futures,listenv)
-S3method(getExpression,ClusterFuture)
 S3method(getExpression,Future)
-S3method(getExpression,MulticoreFuture)
-S3method(getExpression,UniprocessFuture)
+S3method(getFutureBackendConfigs,ClusterFuture)
+S3method(getFutureBackendConfigs,Future)
+S3method(getFutureBackendConfigs,MulticoreFuture)
+S3method(getFutureBackendConfigs,UniprocessFuture)
 S3method(globals,Future)
 S3method(journal,Future)
 S3method(journal,FutureJournal)

R/ClusterFuture-class.R R/backend_api-ClusterFuture-class.RR/ClusterFuture-class.R renamed to R/backend_api-ClusterFuture-class.R

@@ -103,7 +103,7 @@ run.ClusterFuture <- function(future, ...) {
   assertOwner(future)
 
   workers <- future$workers
-  expr <- getExpression(future)
+  data <- getFutureData(future)
   persistent <- isTRUE(future$persistent)
 
   ## FutureRegistry to use
@@ -150,7 +150,7 @@ run.ClusterFuture <- function(future, ...) {
 
 
   ## (ii) Attach packages that needs to be attached
-  ##      NOTE: Already take care of by getExpression() of the Future class.
+  ##      NOTE: Already take care of by evalFuture().
   ##      However, if we need to get an early error about missing packages,
   ##      we can get the error here before launching the future.
   t_start <- Sys.time()
@@ -179,7 +179,7 @@ run.ClusterFuture <- function(future, ...) {
   FutureRegistry(reg, action = "add", future = future, earlySignal = FALSE)
 
   ## (iv) Launch future
-  send_call(cl[[1L]], fun = geval, args = list(expr), future = future, when = "launch future on")
+  send_call(cl[[1L]], fun = evalFuture, args = list(data), when = "launch future on")
 
   future$state <- 'running'
 
@@ -563,90 +563,6 @@ requestNode <- function(await, workers, timeout = getOption("future.wait.timeout
 
 
 
-#' @export
-getExpression.ClusterFuture <- local({
-  tmpl_expr_conditions <- future:::bquote_compile({
-    "# future:::getExpression.ClusterFuture(): inject code for instant"
-    "# relaying of 'immediateCondition' objects back to the parent R  "
-    "# process via the existing PSOCK channel                         "
-    ...future.makeSendCondition <- base::local({
-      sendCondition <- NULL
-
-      function(frame = 1L) {
-        if (is.function(sendCondition)) return(sendCondition)
-
-        ns <- getNamespace("parallel")
-        if (exists("sendData", mode = "function", envir = ns)) {
-          parallel_sendData <- get("sendData", mode = "function", envir = ns)
-
-          ## Find the 'master' argument of the worker's {slave,work}Loop()
-          envir <- sys.frame(frame)
-          master <- NULL
-          while (!identical(envir, .GlobalEnv) && !identical(envir, emptyenv())) {
-            if (exists("master", mode = "list", envir = envir, inherits=FALSE)) {
-              master <- get("master", mode = "list", envir = envir, inherits = FALSE)
-              if (inherits(master, c("SOCKnode", "SOCK0node"))) {
-                sendCondition <<- function(cond) {
-                  data <- list(type = "VALUE", value = cond, success = TRUE)
-                  parallel_sendData(master, data)
-                }
-                return(sendCondition)
-              }
-            }
-            frame <- frame + 1L
-            envir <- sys.frame(frame)
-          }
-        }  
-
-        ## Failed to locate 'master' or 'parallel:::sendData()',
-        ## so just ignore conditions
-        sendCondition <<- function(cond) NULL
-      }
-    })
-
-    withCallingHandlers({
-      .(expr)
-    }, immediateCondition = function(cond) {
-      sendCondition <- ...future.makeSendCondition()
-      sendCondition(cond)
-
-      ## Avoid condition from being signaled more than once
-      ## muffleCondition <- future:::muffleCondition()
-      muffleCondition <- .(muffleCondition)
-      muffleCondition(cond)
-    })
-  })
-
-
-  function(future, expr = future$expr, immediateConditions = TRUE, ...) {
-    ## Assert that no arguments but the first is passed by position
-    assert_no_positional_args_but_first()
-  
-    ## Inject code for resignaling immediateCondition:s?
-    if (immediateConditions) {
-      resignalImmediateConditions <- getOption("future.psock.relay.immediate", TRUE)
-      if (resignalImmediateConditions) {
-        immediateConditionClasses <- getOption("future.relay.immediate", "immediateCondition")
-        if (length(immediateConditionClasses) > 0L) {
-          ## Does the cluster node communicate with a connection?
-          ## (if not, it's via MPI)
-          workers <- future$workers
-          ## AD HOC/FIXME: Here 'future$node' is yet not assigned, so we look at
-          ## the first worker and assume the others are the same. /HB 2019-10-23
-          cl <- workers[1L]
-          node <- cl[[1L]]
-          con <- node$con
-          if (!is.null(con)) {
-            expr <- bquote_apply(tmpl_expr_conditions)
-          } ## if (!is.null(con))
-        }
-      }
-    } ## if (resignalImmediateConditions && immediateConditions)
-    
-    NextMethod(expr = expr, immediateConditions = immediateConditions)
-  }
-})
-
 
 send_call <- function(node, ..., when = "send call to", future) {
   sendCall <- importParallel("sendCall")
@@ -772,3 +688,46 @@ post_mortem_cluster_failure <- function(ex, when, node, future) {
 
   msg
 } # post_mortem_cluster_failure()
+
+
+
+getPsockImmediateConditionHandler <- local({
+  sendCondition <- NULL
+
+  function(frame = 1L) {
+    if (is.function(sendCondition)) return(sendCondition)
+
+    ns <- getNamespace("parallel")
+    if (exists("sendData", mode = "function", envir = ns)) {
+      parallel_sendData <- get("sendData", mode = "function", envir = ns)
+
+      ## Find the 'master' argument of the worker's {slave,work}Loop()
+      envir <- sys.frame(frame)
+      master <- NULL
+      while (!identical(envir, .GlobalEnv) && !identical(envir, emptyenv())) {
+        if (exists("master", mode = "list", envir = envir, inherits = FALSE)) {
+          master <- get("master", mode = "list", envir = envir, inherits = FALSE)
+          if (inherits(master, c("SOCKnode", "SOCK0node"))) {
+            sendCondition <<- function(cond) {
+              data <- list(type = "VALUE", value = cond, success = TRUE)
+              parallel_sendData(master, data)
+            }
+            return(sendCondition)
+          }
+        }
+        frame <- frame + 1L
+        envir <- sys.frame(frame)
+      }
+    }  
+
+    ## Failed to locate 'master' or 'parallel:::sendData()',
+    ## so just ignore immedicate conditions
+    sendCondition <<- function(cond) NULL
+  }
+}) ## getPsockImmediateConditionHandler()
+
+
+psockImmediateConditionHandler <- function(cond) {
+  handler <- getPsockImmediateConditionHandler()
+  handler(cond)
+}