Unbreakify the new profiler, add a couple of unit tests to demonstrate displaying...

diff --git a/basis/tools/profiler/sampling/sampling-tests.factor b/basis/tools/profiler/sampling/sampling-tests.factor
index 615cf97018b2cc8b11c27424e964e3d4b42c6ee6..22e2d17bb6fb2f9665bf85461deffe13d8b749f0 100644 (file)
--- a/basis/tools/profiler/sampling/sampling-tests.factor
+++ b/basis/tools/profiler/sampling/sampling-tests.factor
@@ -1,6 +1,6 @@
 USING: byte-arrays calendar kernel math memory namespaces
 random threads tools.profiler.sampling
-tools.profiler.sampling.private tools.test ;
+tools.profiler.sampling.private tools.test sequences ;
 IN: tools.profiler.sampling.tests
 
 ! Make sure the profiler doesn't blow up the VM
@@ -11,6 +11,10 @@ TUPLE: boom ;
 { } [ 10 [ [ 100 [ 1000 random (byte-array) drop ] times compact-gc ] profile ] times ] unit-test
 { } [ 2 [ [ 1 seconds sleep ] profile ] times ] unit-test
 
+
+[ ] [ [ 10 iota [ sq ] map ] profile flat profile. ] unit-test
+[ ] [ [ 10 iota [ sq ] map ] profile top-down profile. ] unit-test
+
 (clear-samples)
 f raw-profile-data set-global
 gc

diff --git a/basis/tools/profiler/sampling/sampling.factor b/basis/tools/profiler/sampling/sampling.factor
index 9a0fc783c65e4945fdd4ed01491e7946b9e3a2d6..ab23f5be8554cd78bc3ae7ed9aa0f8222f9e46ba 100644 (file)
--- a/basis/tools/profiler/sampling/sampling.factor
+++ b/basis/tools/profiler/sampling/sampling.factor
@@ -24,9 +24,8 @@ CONSTANT: ignore-words
 
 : profile ( quot -- )
     samples-per-second get-global profiling
-    [ 0 profiling ] [
-        (get-samples) raw-profile-data set-global
-    ] cleanup ; inline
+    [ 0 profiling (get-samples) raw-profile-data set-global ]
+    [ ] cleanup ; inline
 
 : total-sample-count ( sample -- count ) 0 swap nth ;
 : gc-sample-count ( sample -- count ) 1 swap nth ;