X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=stampedShare%2Ftest.icl;fp=stampedShare%2Ftest.icl;h=d9e330e063351866d940165d5bed75f5aed9001a;hb=dfcca36a36a964320436b622d18bce909ed5a9fc;hp=9b62ee70a52ac3bd348207d28bf8447e196a6753;hpb=0ca0e0086ac4e1b0be40f820d213fcfcb7deec20;p=clean-tests.git

diff --git a/stampedShare/test.icl b/stampedShare/test.icl
index 9b62ee7..d9e330e 100644
--- 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