print(<Future>): more information + correct total-size calculation for globals

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.49.0-9017
+Version: 1.49.0-9018
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Depends:
     R (>= 3.2.0)

R/backend_api-Future-class.R

@@ -280,39 +280,23 @@ print.Future <- function(x, ...) {
   cat("Label: ", label, "\n", sep = "")
   cat("Expression:\n")
   print(future[["expr"]])
-  cat(sprintf("Lazy evaluation: %s\n", future[["lazy"]]))
-  cat(sprintf("Asynchronous evaluation: %s\n", future[["asynchronous"]]))
-  cat(sprintf("Local evaluation: %s\n", future[["local"]]))
-  cat(sprintf("Environment: %s\n", envname(future[["envir"]])))
-  cat(sprintf("Capture standard output: %s\n", future[["stdout"]]))
-  conditions <- future[["conditions"]]
-  if (length(conditions) > 0) {
-    exclude <- attr(conditions, "exclude", exact = TRUE)
-    if (length(exclude) == 0) exclude <- "<none>"
-    immediateConditionClasses <- attr(conditions, "immediateConditionClasses", exact = TRUE)
-    if (length(immediateConditionClasses) == 0) immediateConditionClasses <- "<none>"
-    cat(sprintf("Capture condition classes: %s (excluding %s)\n",
-                commaq(conditions),
-                commaq(exclude)))
-    cat(sprintf("Immediate condition classes: %s\n",
-                commaq(immediateConditionClasses)))
-  } else {
-    cat("Capture condition classes: <none>\n")
-  }
 
   ## FIXME: Add method globals_of() for Future such that it's possible
   ## also for SequentialFuture to return something here. /HB 2017-05-17
-  g <- future[["globals"]]
-  ng <- length(g)
-  if (ng > 0) {
-    gSizes <- sapply(g, FUN = objectSize)
-    gTotalSize <- sum(gSizes)
-    g <- head(g, n = 5L)
-    gSizes <- head(gSizes, n = 5L)
-    g <- sprintf("%s %s of %s", sapply(g, FUN = function(future) class(future)[1]), sQuote(names(g)), sapply(gSizes, FUN = asIEC))
-    if (ng > length(g)) g <- c(g, "...")
+  gs <- future[["globals"]]
+  ngs <- length(gs)
+  if (ngs > 0) {
+    gTotalSize <- objectSize(gs)
+    gSizes <- sapply(gs, FUN = objectSize)
+    o <- order(gSizes, decreasing = TRUE)
+    o <- head(o, n = 5L)
+    gSizes <- gSizes[o]
+    gs <- gs[o]
+    types <- vapply(gs, FUN.VALUE = NA_character_, FUN = function(g) class(g)[1])
+    g <- sprintf("%s %s of %s", types, sQuote(names(gSizes)), sapply(gSizes, FUN = asIEC))
+    if (ngs > length(gSizes)) g <- c(g, "...")
     g <- hpaste(g, maxHead = 5L, maxTail = 0L)
-    cat(sprintf("Globals: %d objects totaling %s (%s)\n", ng, asIEC(gTotalSize), g))
+    cat(sprintf("Globals: %d objects totaling %s (%s)\n", ngs, asIEC(gTotalSize), g))
   } else {
     cat("Globals: <none>\n")
   }
@@ -331,6 +315,28 @@ print.Future <- function(x, ...) {
     cat("L'Ecuyer-CMRG RNG seed: <none> (seed = ", deparse(future[["seed"]]), ")\n", sep = "")
   }
 
+  cat(sprintf("Capture standard output: %s\n", future[["stdout"]]))
+  conditions <- future[["conditions"]]
+  if (length(conditions) > 0) {
+    exclude <- attr(conditions, "exclude", exact = TRUE)
+    if (length(exclude) == 0) exclude <- "<none>"
+    immediateConditionClasses <- attr(conditions, "immediateConditionClasses", exact = TRUE)
+    if (length(immediateConditionClasses) == 0) immediateConditionClasses <- "<none>"
+    cat(sprintf("Capture condition classes: %s (excluding %s)\n",
+                commaq(conditions),
+                commaq(exclude)))
+    cat(sprintf("Immediate condition classes: %s\n",
+                commaq(immediateConditionClasses)))
+  } else {
+    cat("Capture condition classes: <none>\n")
+  }
+
+  cat(sprintf("Lazy evaluation: %s\n", future[["lazy"]]))
+  cat(sprintf("Local evaluation: %s\n", future[["local"]]))
+  cat(sprintf("Asynchronous evaluation: %s\n", future[["asynchronous"]]))
+  cat(sprintf("Early signaling: %s\n", isTRUE(future[["earlySignal"]])))
+  cat(sprintf("Environment: %s\n", envname(future[["envir"]])))
+
   state <- future[["state"]]
   cat(sprintf("State: %s\n", commaq(state)))
 
@@ -355,25 +361,30 @@ print.Future <- function(x, ...) {
     cat(sprintf("Resolved: %s\n", tryCatch(resolved(future, .signalEarly = FALSE), error = function(ex) NA)))
   }
 
+  cat(sprintf("Unique identifier: %s\n", paste(future[["uuid"]], collapse = "-")))
+  cat(sprintf("Owner process: %s\n", future[["owner"]]))
+  cat(sprintf("Class: %s\n", commaq(class)))
+
   if (hasResult) {
-    if (inherits(result, "FutureResult")) {
-      value <- result[["value"]]
-    } else {
+    if (!inherits(result, "FutureResult")) {
       stop(FutureError(sprintf("The %s object does not have a 'results' field", class(future)[1]), future = future))
     }
+    
+    value <- result[["value"]]
     cat(sprintf("Value: %s of class %s\n", asIEC(objectSize(value)), sQuote(class(value)[1])))
-    if (inherits(result, "FutureResult")) {
-      conditions <- result[["conditions"]]
-      conditionClasses <- vapply(conditions, FUN = function(c) class(c[["condition"]])[1], FUN.VALUE = NA_character_)
-      cat(sprintf("Conditions captured: [n=%d] %s\n", length(conditionClasses), hpaste(sQuote(conditionClasses))))
-    }
+    
+    conditions <- result[["conditions"]]
+    conditionClasses <- vapply(conditions, FUN = function(c) class(c[["condition"]])[1], FUN.VALUE = NA_character_)
+    cat(sprintf("Conditions captured: [n=%d] %s\n", length(conditionClasses), hpaste(sQuote(conditionClasses))))
+
+    t0 <- result[["started"]]
+    t1 <- result[["finished"]]
+    cat(sprintf("Duration: %s (started %s)\n", format(t1-t0), t0))
+    cat(sprintf("Worker process: %s\n", result[["session_uuid"]]))
   } else {
     cat("Value: <not collected>\n")
     cat("Conditions captured: <none>\n")
   }
-  cat(sprintf("Early signaling: %s\n", isTRUE(future[["earlySignal"]])))
-  cat(sprintf("Owner process: %s\n", future[["owner"]]))
-  cat(sprintf("Class: %s\n", commaq(class)))
 } ## print()