tesses50
/
Ooui-tws-port
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix synchronization of the transmit queue

This commit is contained in:
Frank A. Krueger 2017-11-10 12:51:35 -08:00
parent d351b07be4
commit 75841b4a7e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Ooui/UI.cs
View File

@ -570,15 +570,15 @@ namespace Ooui
} }
} }
void QueueStateMessages (EventTarget target) void QueueStateMessagesLocked (EventTarget target)
{ {
if (target == null) return; if (target == null) return;
foreach (var m in target.StateMessages) { foreach (var m in target.StateMessages) {
QueueMessage (m); QueueMessageLocked (m);
} }
} }
void QueueMessage (Message message) void QueueMessageLocked (Message message)
{ {
// //
// Make sure all the referenced objects have been created // Make sure all the referenced objects have been created
@ -589,23 +589,29 @@ namespace Ooui
else { else {
if (!createdIds.Contains (message.TargetId)) { if (!createdIds.Contains (message.TargetId)) {
createdIds.Add (message.TargetId); createdIds.Add (message.TargetId);
QueueStateMessages (element.GetElementById (message.TargetId)); QueueStateMessagesLocked (element.GetElementById (message.TargetId));
} }
if (message.Value is Array a) { if (message.Value is Array a) {
for (var i = 0; i < a.Length; i++) { for (var i = 0; i < a.Length; i++) {
// Console.WriteLine ($"A{i} = {a.GetValue(i)}"); // Console.WriteLine ($"A{i} = {a.GetValue(i)}");
if (a.GetValue (i) is EventTarget e && !createdIds.Contains (e.Id)) { if (a.GetValue (i) is EventTarget e && !createdIds.Contains (e.Id)) {
createdIds.Add (e.Id); createdIds.Add (e.Id);
QueueStateMessages (e); QueueStateMessagesLocked (e);
} }
} }
} }
} }
// //
// Add it to the queue // Add it to the queue
// //
lock (queuedMessages) queuedMessages.Add (message); queuedMessages.Add (message);
}
void QueueMessage (Message message)
{
lock (queuedMessages) {
QueueMessageLocked (message);
}
sendThrottle.Enabled = true; sendThrottle.Enabled = true;
} }