factor: trim using lists

[factor.git] / extra / tools / time / struct / struct.factor

diff --git a/extra/tools/time/struct/struct.factor b/extra/tools/time/struct/struct.factor
index 1f63fc052856341989bf28cfa0d481e0f37008dd..338d2dbf1aa2dcb784612354b53dc3c4b20be2cf 100644 (file)
--- a/extra/tools/time/struct/struct.factor
+++ b/extra/tools/time/struct/struct.factor
@@ -1,26 +1,28 @@
 ! Copyright (C) 2010 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.c-types classes.struct kernel memory
-system vm ;
+USING: accessors alien.c-types classes.struct kernel
+tools.memory system vm ;
 IN: tools.time.struct
 
 STRUCT: benchmark-data
     { time ulonglong }
     { data-room data-heap-room }
-    { code-room mark-sweep-sizes } ;
+    { code-room mark-sweep-sizes }
+    { callback-room mark-sweep-sizes } ;
 
 STRUCT: benchmark-data-pair
     { start benchmark-data }
     { stop benchmark-data } ;
 
 : <benchmark-data> ( -- benchmark-data )
-    \ benchmark-data <struct>
+    benchmark-data <struct>
         nano-count >>time
+        data-room >>data-room
         code-room >>code-room
-        data-room >>data-room ; inline
+        callback-room >>callback-room ; inline
 
 : <benchmark-data-pair> ( start stop -- benchmark-data-pair )
-    \ benchmark-data-pair <struct>
+    benchmark-data-pair <struct>
         swap >>stop
         swap >>start ; inline
 
@@ -28,4 +30,3 @@ STRUCT: benchmark-data-pair
     <benchmark-data>
     [ call ] dip
     <benchmark-data> <benchmark-data-pair> ; inline
-