Merge pull request #118 from lionel-/add-simplify

DESCRIPTION

@@ -27,6 +27,6 @@ Suggests:
     devtools,
     shiny,
     htmltools
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.0
 URL: https://rstudio.github.io/profvis/
 Encoding: UTF-8

NEWS.md

@@ -1,6 +1,8 @@
 profvis 0.3.6.9000
 =============
 
+* Added `simplify` argument. When `TRUE` (the default), the profiles are simplified using the new `filter.callframes` argument of R 4.0. This argument has no effect on older R versions.
+
 * Fixed [#111](https://github.com/rstudio/profvis/issues/111): auto-scrolling to lines of code did not work in some browsers. ([#113](https://github.com/rstudio/profvis/pull/113))
 
 profvis 0.3.6

R/profvis.R

@@ -32,6 +32,11 @@
 #'   \code{torture = steps} helps prevent this, by making R trigger garbage
 #'   collection after every \code{torture} memory allocation step.
 #'
+#' @param simplify Whether to simplify the profiles by removing
+#'   intervening frames caused by lazy evaluation. This only has an
+#'   effect on R 4.0. See the \code{filter.callframes} argument of
+#'   \code{\link{Rprof}()}.
+#'
 #' @seealso \code{\link{print.profvis}} for printing options.
 #' @seealso \code{\link{Rprof}} for more information about how the profiling
 #'   data is collected.
@@ -75,7 +80,7 @@
 #' @export
 profvis <- function(expr = NULL, interval = 0.01, prof_output = NULL,
                     prof_input = NULL, width = NULL, height = NULL,
-                    split = c("h", "v"), torture = 0)
+                    split = c("h", "v"), torture = 0, simplify = TRUE)
 {
   split <- match.arg(split)
   expr_q <- substitute(expr)
@@ -128,8 +133,14 @@ profvis <- function(expr = NULL, interval = 0.01, prof_output = NULL,
       on.exit(gctorture2(step = 0), add = TRUE)
     }
 
-    Rprof(prof_output, interval = interval, line.profiling = TRUE,
-          gc.profiling = TRUE, memory.profiling = TRUE)
+    if (getRversion() >= "4.0.0") {
+      Rprof(prof_output, interval = interval, line.profiling = TRUE,
+            gc.profiling = TRUE, memory.profiling = TRUE,
+            filter.callframes = simplify)
+    } else {
+      Rprof(prof_output, interval = interval, line.profiling = TRUE,
+            gc.profiling = TRUE, memory.profiling = TRUE)
+    }
     on.exit(Rprof(NULL), add = TRUE)
     if (remove_on_exit)
       on.exit(unlink(prof_output), add = TRUE)