antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Optimize synchronization in updatePrototypes(): keep out of synchronized section if possible

Browse source
This commit is contained in:
hns 2005-03-24 18:24:51 +00:00
parent 7af9cc6a22
commit 0856559870
1 changed files with 40 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/helma/scripting/rhino/RhinoCore.java
View file

@ -51,7 +51,7 @@ public final class RhinoCore implements ScopeProvider {
Hashtable prototypes; Hashtable prototypes;
// timestamp of last type update // timestamp of last type update
long lastUpdate = 0; volatile long lastUpdate = 0;
// the wrap factory // the wrap factory
WrapFactory wrapper; WrapFactory wrapper;
@ -310,49 +310,55 @@ public final class RhinoCore implements ScopeProvider {
* here is to check for update those prototypes which already have been compiled * here is to check for update those prototypes which already have been compiled
* before. Others will be updated/compiled on demand. * before. Others will be updated/compiled on demand.
*/ */
public synchronized void updatePrototypes() throws IOException { public void updatePrototypes() throws IOException {
if ((System.currentTimeMillis() - lastUpdate) < 1000L) { if ((System.currentTimeMillis() - lastUpdate) < 1000L) {
return; return;
} }
// init prototypes and/or update prototype checksums synchronized(this) {
app.typemgr.checkPrototypes(); if ((System.currentTimeMillis() - lastUpdate) < 1000L) {
return;
// get a collection of all prototypes (code directories)
Collection protos = app.getPrototypes();
// in order to respect inter-prototype dependencies, we try to update
// the global prototype before all other prototypes, and parent
// prototypes before their descendants.
HashSet checked = new HashSet(protos.size()*2);
TypeInfo type = (TypeInfo) prototypes.get("global");
if (type != null) {
updatePrototype(type, checked);
}
for (Iterator i = protos.iterator(); i.hasNext();) {
Prototype proto = (Prototype) i.next();
if (checked.contains(proto)) {
continue;
} }
type = (TypeInfo) prototypes.get(proto.getLowerCaseName()); // init prototypes and/or update prototype checksums
app.typemgr.checkPrototypes();
if (type == null) { // get a collection of all prototypes (code directories)
// a prototype we don't know anything about yet. Init local update info. Collection protos = app.getPrototypes();
initPrototype(proto);
} else if (type.lastUpdate > -1) { // in order to respect inter-prototype dependencies, we try to update
// only need to update prototype if it has already been initialized. // the global prototype before all other prototypes, and parent
// otherwise, this will be done on demand. // prototypes before their descendants.
HashSet checked = new HashSet(protos.size() * 2);
TypeInfo type = (TypeInfo) prototypes.get("global");
if (type != null) {
updatePrototype(type, checked); updatePrototype(type, checked);
} }
}
lastUpdate = System.currentTimeMillis(); for (Iterator i = protos.iterator(); i.hasNext();) {
Prototype proto = (Prototype) i.next();
if (checked.contains(proto)) {
continue;
}
type = (TypeInfo) prototypes.get(proto.getLowerCaseName());
if (type == null) {
// a prototype we don't know anything about yet. Init local update info.
initPrototype(proto);
} else if (type.lastUpdate > -1) {
// only need to update prototype if it has already been initialized.
// otherwise, this will be done on demand.
updatePrototype(type, checked);
}
}
lastUpdate = System.currentTimeMillis();
}
} }
/** /**