Merge branch 'master' of git.martlubbers.net:clean-tests

[clean-tests.git] / stampedShare / test.icl

diff --git a/stampedShare/test.icl b/stampedShare/test.icl
index 9b62ee7..d9e330e 100644 (file)
--- a/stampedShare/test.icl
+++ b/stampedShare/test.icl
@@ -1,5 +1,6 @@
 module test
 
+<<<<<<< HEAD
 import iTasks.Extensions.DateTime
 import System.Time
 import iTasks
@@ -13,3 +14,22 @@ t     =  viewSharedInformation [] sh
        -&&- updateSharedInformation [] (dateTimeStampedShare sh)
        -&&- viewSharedInformation [] sh`
        -&&- updateSharedInformation [] (timespecStampedShare sh`)
+=======
+import iTasks.Internal.IWorld
+import System.Time
+import iTasks
+
+sh = sharedStore "bork2" ({Timespec|tv_sec=0,tv_nsec=0}, 42)
+
+Start w = doTasks t w
+
+t = viewSharedInformation [] sh
+       -&&- updateSharedInformation [] (
+                         sdsTranslate "" (\p->((), p))
+                       (sdsStamp sh ticker (\x y->(x, y))))
+
+// This gives you 100% cpu because you get updates very fast
+//t = viewSharedInformation [] ticker
+
+ticker = sdsFocus {start={tv_sec=0,tv_nsec=0},interval={Timespec|tv_sec=0,tv_nsec=1000000}} iworldTimespec
+>>>>>>> 49f7dcc4c088dc816398a0c7854d75d7c2628f15