fly/fgdata
1
0
Fork 0
Code Activity

Merge /u/forgolai/fg-data2/ branch emesary-fix into next

Browse source 
https://sourceforge.net/p/flightgear/fgdata/merge-requests/197/
This commit is contained in:
Richard Harrison 2020-05-31 19:20:56 +00:00
commit 60097f3c74
1 changed files with 33 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
Nasal/emesary_mp_bridge.nas
View file

@ -98,8 +98,7 @@ var OutgoingMPBridge =
new_class.NotificationsToBridge_Lookup = {}; new_class.NotificationsToBridge_Lookup = {};
foreach(var n ; new_class.NotificationsToBridge) foreach(var n ; new_class.NotificationsToBridge) {
{
print(" ",_ident," outwards bridge[",n,"] notifications of type --> ",n.NotificationType, " Id ",n.TypeId); print(" ",_ident," outwards bridge[",n,"] notifications of type --> ",n.NotificationType, " Id ",n.TypeId);
n.MessageIndex = OutgoingMPBridge.StartMessageIndex; n.MessageIndex = OutgoingMPBridge.StartMessageIndex;
new_class.NotificationsToBridge_Lookup[n.TypeId] = n; new_class.NotificationsToBridge_Lookup[n.TypeId] = n;
@ -146,10 +145,8 @@ var OutgoingMPBridge =
return emesary.Transmitter.ReceiptStatus_NotProcessed; return emesary.Transmitter.ReceiptStatus_NotProcessed;
#print("Receive ",notification.NotificationType," ",notification.Ident); #print("Receive ",notification.NotificationType," ",notification.Ident);
for (var idx = 0; idx < size(me.NotificationsToBridge); idx += 1) for (var idx = 0; idx < size(me.NotificationsToBridge); idx += 1) {
{ if(me.NotificationsToBridge[idx].NotificationType == notification.NotificationType) {
if(me.NotificationsToBridge[idx].NotificationType == notification.NotificationType)
{
me.NotificationsToBridge[idx].MessageIndex += 1; me.NotificationsToBridge[idx].MessageIndex += 1;
notification.MessageExpiryTime = systime()+me.MessageLifeTime; notification.MessageExpiryTime = systime()+me.MessageLifeTime;
notification.Expired = 0; notification.Expired = 0;
@ -167,14 +164,12 @@ var OutgoingMPBridge =
}; };
new_class.AddToOutgoing = func(notification) new_class.AddToOutgoing = func(notification)
{ {
if (notification.IsDistinct) if (notification.IsDistinct) {
{ for (var idx = 0; idx < size(me.OutgoingList); idx += 1) {
for (var idx = 0; idx < size(me.OutgoingList); idx += 1)
{
if (me.trace) if (me.trace)
print("Compare [",idx,"] qId=",me.OutgoingList[idx].GetBridgeMessageNotificationTypeKey() ," noti --> ",notification.GetBridgeMessageNotificationTypeKey()); print("Compare [",idx,"] qId=",me.OutgoingList[idx].GetBridgeMessageNotificationTypeKey() ," noti --> ",notification.GetBridgeMessageNotificationTypeKey());
if(me.OutgoingList[idx].GetBridgeMessageNotificationTypeKey() == notification.GetBridgeMessageNotificationTypeKey())
{ if(me.OutgoingList[idx].GetBridgeMessageNotificationTypeKey() == notification.GetBridgeMessageNotificationTypeKey()) {
if (me.trace) if (me.trace)
print(" --> Update ",me.OutgoingList[idx].GetBridgeMessageNotificationTypeKey() ," noti --> ",notification.GetBridgeMessageNotificationTypeKey()); print(" --> Update ",me.OutgoingList[idx].GetBridgeMessageNotificationTypeKey() ," noti --> ",notification.GetBridgeMessageNotificationTypeKey());
me.OutgoingList[idx]= notification; me.OutgoingList[idx]= notification;
@ -196,18 +191,17 @@ var OutgoingMPBridge =
{ {
var outgoing = ""; var outgoing = "";
var cur_time=systime(); var cur_time=systime();
for (var idx = 0; idx < size(me.OutgoingList); idx += 1) for (var idx = 0; idx < size(me.OutgoingList); idx += 1) {
{
var sect = ""; var sect = "";
var notification = me.OutgoingList[idx]; var notification = me.OutgoingList[idx];
if (!notification.Expired and notification.MessageExpiryTime > cur_time)
{ if (!notification.Expired and notification.MessageExpiryTime > cur_time) {
var encval=""; var encval="";
var first_time = 1; var first_time = 1;
var eidx = 0; var eidx = 0;
notification.Expired = 0; notification.Expired = 0;
foreach(var p ; notification.bridgeProperties())
{ foreach(var p ; notification.bridgeProperties()) {
var nv = p.getValue(); var nv = p.getValue();
encval = encval ~ nv; encval = encval ~ nv;
eidx += 1; eidx += 1;
@ -218,19 +212,14 @@ var OutgoingMPBridge =
OutgoingMPBridge.SeperatorChar, emesary.BinaryAsciiTransfer.encodeInt(notification.BridgeMessageNotificationTypeId,1), OutgoingMPBridge.SeperatorChar, emesary.BinaryAsciiTransfer.encodeInt(notification.BridgeMessageNotificationTypeId,1),
OutgoingMPBridge.SeperatorChar, encval, OutgoingMPBridge.MessageEndChar); OutgoingMPBridge.SeperatorChar, encval, OutgoingMPBridge.MessageEndChar);
if (size(outgoing) + size(sect) < me.MPStringMaxLen) if (size(outgoing) + size(sect) < me.MPStringMaxLen) {
{
outgoing = outgoing~sect; outgoing = outgoing~sect;
} } else {
else
{
print("Emesary: ERROR [",me.Ident,"] out of space for ",notification.NotificationType, " transmitted count=",idx, " queue size ",size(me.OutgoingList)); print("Emesary: ERROR [",me.Ident,"] out of space for ",notification.NotificationType, " transmitted count=",idx, " queue size ",size(me.OutgoingList));
notification.MessageExpiryTime = systime()+me.MessageLifeTime; notification.MessageExpiryTime = systime()+me.MessageLifeTime;
break; break;
} }
} } else {
else
{
notification.Expired = 1; notification.Expired = 1;
} }
} }
@ -249,11 +238,9 @@ var OutgoingMPBridge =
# (pop removes the last element from a vector) # (pop removes the last element from a vector)
var outSize = size(me.OutgoingList)-1; var outSize = size(me.OutgoingList)-1;
var out_idx = 0; var out_idx = 0;
for (var idx = 0; idx <= outSize; idx += 1) for (var idx = 0; idx <= outSize; idx += 1) {
{
#print("Q1 [",idx,"] ",me.OutgoingList[idx].MessageExpiryTime-cur_time," Expired=",me.OutgoingList[idx].Expired); #print("Q1 [",idx,"] ",me.OutgoingList[idx].MessageExpiryTime-cur_time," Expired=",me.OutgoingList[idx].Expired);
if(!me.OutgoingList[idx].Expired) if(!me.OutgoingList[idx].Expired) {
{
#print("move ",idx, " => ",out_idx); #print("move ",idx, " => ",out_idx);
var mmove = me.OutgoingList[idx]; var mmove = me.OutgoingList[idx];
me.OutgoingList[out_idx] = me.OutgoingList[idx]; me.OutgoingList[out_idx] = me.OutgoingList[idx];
@ -262,8 +249,7 @@ var OutgoingMPBridge =
} }
var to_del = (outSize+1) - out_idx; var to_del = (outSize+1) - out_idx;
#print("--> out idx",out_idx, " to delete ",to_del); #print("--> out idx",out_idx, " to delete ",to_del);
while(to_del > 0) while(to_del > 0) {
{
#print("--> pop "); #print("--> pop ");
pop(me.OutgoingList); pop(me.OutgoingList);
to_del = to_del - 1; to_del = to_del - 1;
@ -298,12 +284,13 @@ var IncomingMPBridge =
new_class.NotificationsToBridge_Lookup = {}; new_class.NotificationsToBridge_Lookup = {};
foreach(var n ; new_class.NotificationsToBridge) foreach(var n ; new_class.NotificationsToBridge) {
{ print(" Incoming bridge notification type --> ",n.NotificationType);
print(" Incoming bridge notification type --> ",n.NotificationType); var new_n = {parents: [n]};
n.IncomingMessageIndex = OutgoingMPBridge.StartMessageIndex; new_n.IncomingMessageIndex = OutgoingMPBridge.StartMessageIndex;
new_class.NotificationsToBridge_Lookup[n.TypeId] = n; new_class.NotificationsToBridge_Lookup[n.TypeId] = new_n;
} }
new_class.MPout = ""; new_class.MPout = "";
new_class.MPidx = _mpidx; new_class.MPidx = _mpidx;
new_class.MPpropertyBase = _propertybase; new_class.MPpropertyBase = _propertybase;
@ -322,7 +309,7 @@ var IncomingMPBridge =
{ {
#print("incoming ",getprop(me.CallsignPath)," -->",me.PropertyRoot," v=",v.getValue()); #print("incoming ",getprop(me.CallsignPath)," -->",me.PropertyRoot," v=",v.getValue());
me.ProcessIncoming(v.getValue()); me.ProcessIncoming(v.getValue());
}); },0,0);
}; };
new_class.setprop = func(property, value){ new_class.setprop = func(property, value){
if (IncomingMPBridge.trace == 2) if (IncomingMPBridge.trace == 2)
@ -350,6 +337,10 @@ var IncomingMPBridge =
{ {
if (encoded_val == "") if (encoded_val == "")
return; return;
if(right(encoded_val,1) != OutgoingMPBridge.MessageEndChar)
printf("Error: emesary.IncomingBridge.ProcessIncoming Missing endChar. From %s. Message=%s",me.GetCallsign(),encoded_val);
var encoded_notifications = split(OutgoingMPBridge.MessageEndChar, encoded_val); var encoded_notifications = split(OutgoingMPBridge.MessageEndChar, encoded_val);
for (var idx = 0; idx < size(encoded_notifications); idx += 1) { for (var idx = 0; idx < size(encoded_notifications); idx += 1) {
if (encoded_notifications[idx] == "") if (encoded_notifications[idx] == "")
@ -393,7 +384,7 @@ var IncomingMPBridge =
dv = bp.setValue(msg_body, me, pos); dv = bp.setValue(msg_body, me, pos);
if (IncomingMPBridge.trace > 2) if (IncomingMPBridge.trace > 2)
print(" --> next pos ",pos); print(" --> next pos ", dv.pos);
if (dv.pos == pos or dv.pos > msglen) if (dv.pos == pos or dv.pos > msglen)
break; break;
@ -447,8 +438,7 @@ var IncomingMPBridge =
var path = v.getValue(); var path = v.getValue();
# Ensure we only handle multiplayer elements # Ensure we only handle multiplayer elements
if (find("/multiplayer",path) > 0) if (find("/multiplayer",path) > 0) {
{
var callsign = getprop(path~"/callsign"); var callsign = getprop(path~"/callsign");
print("Creating Emesary MPBridge for ",path); print("Creating Emesary MPBridge for ",path);
if (callsign == "" or callsign == nil) if (callsign == "" or callsign == nil)
@ -464,8 +454,7 @@ var IncomingMPBridge =
setlistener("/ai/models/model-removed", func(v){ setlistener("/ai/models/model-removed", func(v){
var path = v.getValue(); var path = v.getValue();
var bridge = me.incomingBridgeList[path]; var bridge = me.incomingBridgeList[path];
if (bridge != nil) if (bridge != nil) {
{
# print("Bridge removed for ",v.getValue()); # print("Bridge removed for ",v.getValue());
bridge.Remove(); bridge.Remove();
me.incomingBridgeList[path]=nil; me.incomingBridgeList[path]=nil;