fly/fgdata
1
0
Fork 0
Code Activity

Anders Gidenstam:

Browse source 
I suspect that work around for the /ai/models/model-added listener problem
(i.e. that the listener is called in the middle of the process of
adding/removing a MP entry) isn't the right way to solve the problem.

The attached patch instead defer processing of the added/removed
MP entries in the multiplayer Nasal module until the next time the Nasal
subsystem is executed. This should prevent the problematic execution of
the Nasal listener callback in the middle of C++ MP code.
This commit is contained in:
torsten 2009-10-11 11:57:58 +00:00
parent a48eb09c7d
commit 862730999e
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Nasal/multiplayer.nas
View file

@ -358,8 +358,16 @@ var model = {
me.L = []; me.L = [];
me.warned = {}; me.warned = {};
me.fg_root = string.normpath(getprop("/sim/fg-root")) ~ '/'; me.fg_root = string.normpath(getprop("/sim/fg-root")) ~ '/';
append(me.L, setlistener("ai/models/model-added", func(n) me.update(n.getValue()))); append(me.L, setlistener("ai/models/model-added", func(n) {
append(me.L, setlistener("ai/models/model-removed", func(n) me.update(n.getValue()))); # Defer update() to the next convenient time to allow the
# new MP entry to become fully initialized.
settimer(func me.update(n.getValue()), 0);
}));
append(me.L, setlistener("ai/models/model-removed", func(n) {
# Defer update() to the next convenient time to allow the
# old MP entry to become fully deactivated.
settimer(func me.update(n.getValue()), 0);
}));
me.update(); me.update();
}, },
update: func(n = nil) { update: func(n = nil) {
@ -367,18 +375,13 @@ var model = {
if (n != nil and changedNode.getName() != "multiplayer") if (n != nil and changedNode.getName() != "multiplayer")
return; return;
var changedNodeIndex = changedNode != nil ? changedNode.getIndex() : -1;
me.data = {}; me.data = {};
me.callsign = {}; me.callsign = {};
me.available = []; me.available = [];
me.unavailable = []; me.unavailable = [];
foreach (var n; props.globals.getNode("ai/models", 1).getChildren("multiplayer")) { foreach (var n; props.globals.getNode("ai/models", 1).getChildren("multiplayer")) {
# Ignore valid property for the newly added multiplayer aircraft. if (!n.getNode("valid").getValue())
# It is false when model-added is triggered and will become true after this
# listener is finished
if (n.getIndex() != changedNodeIndex and !n.getNode("valid", 1).getValue())
continue; continue;
if ((var callsign = n.getNode("callsign")) == nil or !(callsign = callsign.getValue())) if ((var callsign = n.getNode("callsign")) == nil or !(callsign = callsign.getValue()))