_gcHash = naNil();
_nextGCKey = 0; // Any value will do
_callCount = 0;
- _purgeListeners = false;
}
// Does a naCall() in a new context. Wrapped here to make lock
// drop the lock in every extension function that might call back into
// Nasal, we keep a stack depth counter here and only unlock/lock
// around the naCall if it isn't the first one.
-naRef FGNasalSys::call(naRef code, naRef locals)
+naRef FGNasalSys::call(naRef code, int argc, naRef* args, naRef locals)
{
naContext ctx = naNewContext();
if(_callCount) naModUnlock();
_callCount++;
- naRef result = naCall(ctx, code, 0, 0, naNil(), locals);
+ naRef result = naCall(ctx, code, argc, args, naNil(), locals);
if(naGetError(ctx))
logError(ctx);
_callCount--;
strlen(sourceCode));
if(naIsNil(code))
return false;
- call(code, naNil());
+ call(code, 0, 0, naNil());
return true;
}
naRuntimeError(c, "airportinfo() with invalid function arguments");
return naNil();
}
- if(!apt) {
- naRuntimeError(c, "airportinfo(): no airport found");
- return naNil();
- }
+ if(!apt) return naNil();
string id = apt->getId();
string name = apt->getName();
// Table of extension functions. Terminate with zeros.
-static struct { char* name; naCFunction func; } funcs[] = {
+static struct { const char* name; naCFunction func; } funcs[] = {
{ "getprop", f_getprop },
{ "setprop", f_setprop },
{ "print", f_print },
void FGNasalSys::update(double)
{
- if(_purgeListeners) {
- _purgeListeners = false;
- map<int, FGNasalListener *>::iterator it;
- for(it = _listener.begin(); it != _listener.end();) {
- FGNasalListener *nl = it->second;
- if(nl->_dead) {
- _listener.erase(it++);
- delete nl;
- } else {
- ++it;
- }
- }
+ if(!_dead_listener.empty()) {
+ vector<FGNasalListener *>::iterator it, end = _dead_listener.end();
+ for(it = _dead_listener.begin(); it != end; ++it) delete *it;
+ _dead_listener.clear();
}
+
+ // The global context is a legacy thing. We use dynamically
+ // created contexts for naCall() now, so that we can call them
+ // recursively. But there are still spots that want to use it for
+ // naNew*() calls, which end up leaking memory because the context
+ // only clears out its temporary vector when it's *used*. So just
+ // junk it and fetch a new/reinitialized one every frame. This is
+ // clumsy: the right solution would use the dynamic context in all
+ // cases and eliminate _context entirely. But that's more work,
+ // and this works fine (yes, they say "New" and "Free", but
+ // they're very fast, just trust me). -Andy
+ naFreeContext(_context);
+ _context = naNewContext();
}
// Loads the scripts found under /nasal in the global tree
_cmdArg = (SGPropertyNode*)arg;
- call(code, locals);
+ call(code, 0, 0, locals);
hashset(_globals, moduleName, locals);
}
// code doesn't need it.
_cmdArg = (SGPropertyNode*)arg;
- call(code, locals);
+ call(code, 0, 0, locals);
return true;
}
void FGNasalSys::handleTimer(NasalTimer* t)
{
- call(t->handler, naNil());
+ call(t->handler, 0, 0, naNil());
gcRelease(t->gcKey);
}
SG_LOG(SG_NASAL, SG_DEBUG, "Attaching listener to tied property " <<
node->getPath());
- naRef handler = argc > 1 ? args[1] : naNil();
- if(!(naIsCode(handler) || naIsCCode(handler) || naIsFunc(handler))) {
+ naRef code = argc > 1 ? args[1] : naNil();
+ if(!(naIsCode(code) || naIsCCode(code) || naIsFunc(code))) {
naRuntimeError(c, "setlistener() with invalid function argument");
return naNil();
}
- bool persistent = argc > 3 ? naTrue(args[3]) : true;
- FGNasalListener *nl = new FGNasalListener(node, handler, this,
- gcSave(handler), _listenerId, persistent);
+ int type = argc > 3 && naIsNum(args[3]) ? (int)args[3].num : 1;
+ FGNasalListener *nl = new FGNasalListener(node, code, this,
+ gcSave(code), _listenerId, type);
bool initial = argc > 2 && naTrue(args[2]);
node->addChangeListener(nl, initial);
return naNil();
}
- FGNasalListener *nl = it->second;
- if(nl->_active) {
- nl->_dead = true;
- _purgeListeners = true;
- return naNum(-1);
- }
-
+ it->second->_dead = true;
+ _dead_listener.push_back(it->second);
_listener.erase(it);
- delete nl;
return naNum(_listener.size());
}
// FGNasalListener class.
-FGNasalListener::FGNasalListener(SGPropertyNode_ptr node, naRef handler,
- FGNasalSys* nasal, int key, int id,
- bool persistent) :
+FGNasalListener::FGNasalListener(SGPropertyNode *node, naRef code,
+ FGNasalSys* nasal, int key, int id, int type) :
_node(node),
- _handler(handler),
+ _code(code),
_gcKey(key),
_id(id),
_nas(nasal),
+ _type(type),
_active(0),
_dead(false),
_first_call(true),
- _persistent(persistent),
_last_int(0L),
_last_float(0.0)
{
_nas->gcRelease(_gcKey);
}
+void FGNasalListener::call(SGPropertyNode* which, naRef mode)
+{
+ if(_active || _dead) return;
+ SG_LOG(SG_NASAL, SG_DEBUG, "trigger listener #" << _id);
+ _active++;
+ naRef arg[4];
+ arg[0] = _nas->propNodeGhost(which);
+ arg[1] = _nas->propNodeGhost(_node);
+ arg[2] = mode; // value changed, child added/removed
+ arg[3] = naNum(_node != which); // child event?
+ _nas->_cmdArg = _node;
+ _nas->call(_code, 4, arg, naNil());
+ _active--;
+}
+
void FGNasalListener::valueChanged(SGPropertyNode* node)
{
- // drop recursive listener calls
- if(_active || _dead)
- return;
- if(_persistent || changed(node) || _first_call) {
- SG_LOG(SG_NASAL, SG_DEBUG, "trigger listener #" << _id);
- _active++;
- _nas->_cmdArg = node;
- _nas->call(_handler, naNil());
- _active--;
- }
+ if(_type < 2 && node != _node) return; // skip child events
+ if(_type > 0 || changed(_node) || _first_call)
+ call(node, naNum(0));
+
_first_call = false;
}
+void FGNasalListener::childAdded(SGPropertyNode*, SGPropertyNode* child)
+{
+ if(_type == 2) call(child, naNum(1));
+}
+
+void FGNasalListener::childRemoved(SGPropertyNode*, SGPropertyNode* child)
+{
+ if(_type == 2) call(child, naNum(-1));
+}
+
bool FGNasalListener::changed(SGPropertyNode* node)
{
SGPropertyNode::Type type = node->getType();
projects / flightgear.git / blobdiff