repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add debug
[mTask.git]
/
Tasks
/
mTaskTask.icl
diff --git
a/Tasks/mTaskTask.icl
b/Tasks/mTaskTask.icl
index
9bd5612
..
27edc82
100644
(file)
--- a/
Tasks/mTaskTask.icl
+++ b/
Tasks/mTaskTask.icl
@@
-17,7
+17,7
@@
sendTaskToDevice wta mTask (device, timeout) =
get bcStateStore @ toMessages timeout mTask
>>= \(msgs, st1)->set st1 bcStateStore
>>| toSDSRecords msgs st1 device
get bcStateStore @ toMessages timeout mTask
>>= \(msgs, st1)->set st1 bcStateStore
>>| toSDSRecords msgs st1 device
- >>= \sdss->upd
(mergeShares sdss) sdsStore
+ >>= \sdss->upd
ateShares device ((++) sdss)
>>| sendMessages msgs device
>>| makeTask wta -1
>>= withDevices device o addTask
>>| sendMessages msgs device
>>| makeTask wta -1
>>= withDevices device o addTask
@@
-27,12
+27,8
@@
sendTaskToDevice wta mTask (device, timeout) =
toSDSRecords :: [MTaskMSGSend] BCState MTaskDevice -> Task [MTaskShare]
toSDSRecords s st device = treturn
toSDSRecords :: [MTaskMSGSend] BCState MTaskDevice -> Task [MTaskShare]
toSDSRecords s st device = treturn
- [makeShare wta device.deviceName sdsi sdsval
- \\{sdsi,sdspub,sdsval}<-st.sdss
- , (MTSds sdsi` _)<-s
- | sdsi == sdsi`]
-
- mergeShares a b = a ++ b
+ [makeShare wta sdsi sdsval
+ \\{sdsi,sdsval}<-st.sdss, (MTSds sdsi` _)<-s | sdsi == sdsi`]
addTask :: MTaskTask MTaskDevice -> MTaskDevice
addTask task device = {device & deviceTasks=[task:device.deviceTasks]}
addTask :: MTaskTask MTaskDevice -> MTaskDevice
addTask task device = {device & deviceTasks=[task:device.deviceTasks]}