X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.icl;h=378a5e32e440be29c20f33571fb367bf937c1487;hb=7d9088b54956fe56c36ca8d01ec386b48f0a1c47;hp=9b26455a6d0cc2055cf1074e1a27c8d687225217;hpb=be3f747f775c05facb8a34cf0baba523401b88fb;p=mTask.git

diff --git a/Devices/mTaskDevice.icl b/Devices/mTaskDevice.icl
index 9b26455..378a5e3 100644
--- a/Devices/mTaskDevice.icl
+++ b/Devices/mTaskDevice.icl
@@ -7,12 +7,14 @@ import iTasks
 import iTasksTTY
 import TTY
 import qualified Data.Map as DM
+import qualified Data.List as DL
 import Utils.SDS
 import Utils.Devices
 
 import GenBimap
 import Devices.mTaskSerial
 import Devices.mTaskTCP
+import Data.Tuple
 import iTasks._Framework.Store
 import iTasks.UI.Definition, iTasks.UI.Editor, iTasks.UI.Editor.Builtin, iTasks.UI.Editor.Common, iTasks.UI.Layout.Default, iTasks.UI.Layout.Common
 
@@ -29,6 +31,12 @@ startupDevices :: Task [MTaskDevice]
 startupDevices = upd (map reset) deviceStore
 	where reset d = {d & deviceTask=Nothing, deviceTasks=[], deviceError=Nothing}
 
+withDevice :: (MTaskDevice -> Task a) String -> Task a | iTask a
+withDevice f s = get deviceStore
+	>>= \ds->case 'DL'.find (\d->d.deviceName == s) ds of
+		Nothing = throw "Device not available"
+		Just d = f d
+
 makeDevice :: String MTaskResource -> Task MTaskDevice
 makeDevice name res = get randomInt @ \rand->{MTaskDevice
 		|deviceChannels=name +++ toString rand
@@ -37,7 +45,8 @@ makeDevice name res = get randomInt @ \rand->{MTaskDevice
 		,deviceTask=Nothing
 		,deviceError=Nothing
 		,deviceData=res
-		,deviceSpec=Nothing}
+		,deviceSpec=Nothing
+		,deviceShares=[]}
 
 getSynFun :: MTaskResource -> ((Shared Channels) -> Task ())
 getSynFun (TCPDevice t) = synFun t
@@ -63,7 +72,9 @@ addDevice devices processFun
 connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
 connectDevice pf d = let ch = channels d in appendTopLevelTask 'DM'.newMap True
 	(pf d ch -||- catchAll (getSynFun d.deviceData ch) errorHandle)
-	>>= \tid->withDevices d (\d->{d&deviceTask=Just tid,deviceError=Nothing}) @! ()
+	>>= \tid->withDevices d (\d->{d&deviceTask=Just tid,deviceError=Nothing})
+	>>| upd (\(r,s,ss)->(r,s++[MTSpec],ss)) ch
+	@! ()
 	where
 		errorHandle e = withDevices d (\d->{d&deviceTask=Nothing,deviceError=Just e})
 
@@ -90,45 +101,32 @@ viewDevice pf d = forever $ traceValue "viewDevice" >>| anyTask
 		dropEmpty (r,s,ss) = (filter ((=!=)MTEmpty) r,s,ss)
 
 deleteDevice :: MTaskDevice -> Task ()
-deleteDevice d = upd (\(r,s,ss)->(r,s,True)) (channels d)
+deleteDevice d = sendMessages [MTShutdown] d
+	>>| wait "Waiting for the channels to empty" (\(r,s,ss)->isEmpty s) (channels d)
+	>>| upd (\(r,s,ss)->(r,s,True)) (channels d)
 	>>| maybe (treturn ()) (flip removeTask topLevelTasks) d.deviceTask
 	>>| upd (filter ((<>)d)) deviceStore
+//	>>| cleanSharesDevice d.deviceName
 	@! ()
 
-sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
-sendToDevice wta mTask (device, timeout) =
-		traceValue "starting to send"
-	>>| get bcStateStore @ toMessages timeout o toRealByteCode (unMain mTask)
-	>>= \(msgs, st1)->traceValue "messages generated"
-	>>| set st1 bcStateStore
-	>>| traceValue "bcstate store updated"
-	>>| toSDSRecords st1
-	>>= \sdss->traceValue "Shares created"
-	>>| set sdss sdsStore//MTaskShareaddToSDSShare
-	>>| traceValue "Shares store updated"
-	>>| sendMessages msgs device
-	>>| traceValue "Messages sent"
-	>>| makeTask wta -1
-	>>= \t->traceValue "Task made"
-	>>| withDevices device (addTask t)
-	>>| traceValue "Tasks share updated"
-	@! ()
-	where
-		sharename i = device.deviceChannels +++ "-" +++ toString i
-		toSDSRecords st = sequence "" [makeShare wta sdsi sdsval\\{sdsi,sdspub,sdsval}<-st.sdss]// | sdspub]
+sendMessages :: [MTaskMSGSend] MTaskDevice -> Task Channels
+sendMessages msgs dev = upd (realMessageSend msgs) $ channels dev
 
-		addTask :: MTaskTask MTaskDevice -> MTaskDevice
-		addTask task device = {device & deviceTasks=[task:device.deviceTasks]}
+sendMessagesIW :: [MTaskMSGSend] MTaskDevice *IWorld -> *(MaybeError TaskException (), *IWorld)
+sendMessagesIW msgs dev iworld 
+	= modify (tuple () o realMessageSend msgs) (channels dev) iworld
 
-sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
-sendMessages msgs = upd (\(r,s,ss)->(r,msgs++s,ss)) o channels
+realMessageSend :: [MTaskMSGSend] Channels -> Channels
+realMessageSend msgs (r,s,ss) = (r,msgs++s,ss)
 
 withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task ()
 withDevices a trans = upd (map \b->if (b == a) (trans b) b) deviceStore @! ()
 
-deviceTaskAcked :: MTaskDevice Int -> Task ()
-deviceTaskAcked dev i 
-	= withDevices dev (\d->{d&deviceTasks=ackFirst d.deviceTasks})
+deviceTaskAcked :: MTaskDevice Int Int -> Task ()
+deviceTaskAcked dev i mem
+	= withDevices dev (\d->{d
+			&deviceTasks=ackFirst d.deviceTasks
+			,deviceSpec=Just {fromJust d.deviceSpec & bytesMemory=mem}})
 	where
 		ackFirst :: [MTaskTask] -> [MTaskTask]
 		ackFirst [] = []
@@ -139,7 +137,8 @@ deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
 deviceTaskDelete dev task = sendMessages [MTTaskDel task.ident] dev @! ()
 
 deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
-deviceTaskDeleteAcked d i = withDevices d $ deleteTask
+deviceTaskDeleteAcked d i = cleanSharesTask i d
+	>>| withDevices d deleteTask
 	where deleteTask d = {d & deviceTasks=[s\\s<-d.deviceTasks | i <> s.ident]}
 
 deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task ()