Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate property cache flush under JS_ClearScope (107265, r=shaver, sr=jband).

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@106560 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
brendan%mozilla.org 2001-10-29 19:30:03 +00:00
parent 39bbba1dc0
commit bc470f1b6b
4 changed files with 47 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/js/src/jscntxt.h
View File

@ -334,7 +334,10 @@ struct JSContext {
JSPackedBool rval2set;
#endif
/* Exception state (NB: throwing packs with rval2set, above). */
/* True if clearing a scope -- used to coalesce property cache flushes. */
JSPackedBool clearingScope;
/* Exception state (NB: throwing packs with clearingScope, above). */
JSPackedBool throwing; /* is there a pending exception? */
jsval exception; /* most-recently-thrown exceptin */

23
mozilla/js/src/jsinterp.c
View File

@ -102,6 +102,29 @@ js_FlushPropertyCache(JSContext *cx)
cache->flushes++;
}
void
js_FlushPropertyCacheByObject(JSContext *cx, JSObject *obj)
{
JSPropertyCache *cache;
JSPropertyCacheEntry *end, *pce, entry;
JSObject *pce_obj;
cache = &cx->runtime->propertyCache;
if (cache->empty)
return;
end = &cache->table[PROPERTY_CACHE_SIZE];
for (pce = &cache->table[0]; pce < end; pce++) {
PCE_LOAD(cache, pce, entry);
pce_obj = PCE_OBJECT(entry);
if (pce_obj == obj) {
PCE_OBJECT(entry) = NULL;
PCE_PROPERTY(entry) = NULL;
PCE_STORE(cache, pce, entry);
}
}
}
void
js_FlushPropertyCacheByProp(JSContext *cx, JSProperty *prop)
{

3
mozilla/js/src/jsinterp.h
View File

@ -202,6 +202,9 @@ typedef struct JSPropertyCache {
extern void
js_FlushPropertyCache(JSContext *cx);
extern void
js_FlushPropertyCacheByObject(JSContext *cx, JSObject *obj);
extern void
js_FlushPropertyCacheByProp(JSContext *cx, JSProperty *prop);

20
mozilla/js/src/jsscope.c
View File

@ -229,6 +229,11 @@ js_hash_scope_clear(JSContext *cx, JSScope *scope)
JSScopePrivate *priv;
JS_ASSERT(JS_IS_SCOPE_LOCKED(scope));
JS_ASSERT(!cx->clearingScope);
if (!cx->runtime->gcRunning && scope->object) {
cx->clearingScope = JS_TRUE;
js_FlushPropertyCacheByObject(cx, scope->object);
}
priv = (JSScopePrivate *) table->allocPriv;
priv->context = cx;
JS_HashTableEnumerateEntries(table, js_hash_scope_slot_invalidator, NULL);
@ -236,6 +241,7 @@ js_hash_scope_clear(JSContext *cx, JSScope *scope)
JS_free(cx, priv);
scope->ops = &js_list_scope_ops;
scope->data = NULL;
cx->clearingScope = JS_FALSE;
}
JSScopeOps js_hash_scope_ops = {
@ -358,6 +364,11 @@ js_list_scope_clear(JSContext *cx, JSScope *scope)
JSScopeProperty *sprop;
JS_ASSERT(JS_IS_SCOPE_LOCKED(scope));
JS_ASSERT(!cx->clearingScope);
if (!cx->runtime->gcRunning && scope->object) {
cx->clearingScope = JS_TRUE;
js_FlushPropertyCacheByObject(cx, scope->object);
}
while ((sym = (JSSymbol *) scope->data) != NULL) {
scope->data = sym->entry.next;
priv.context = cx;
@ -367,6 +378,7 @@ js_list_scope_clear(JSContext *cx, JSScope *scope)
sprop->slot = SPROP_INVALID_SLOT;
js_free_symbol(&priv, &sym->entry, HT_FREE_ENTRY);
}
cx->clearingScope = JS_FALSE;
}
JSScopeOps JS_FRIEND_DATA(js_list_scope_ops) = {
@ -559,10 +571,12 @@ js_DestroyScopeProperty(JSContext *cx, JSScope *scope, JSScopeProperty *sprop)
}
/*
* Purge any cached weak links to prop (unless we're running the gc, which
* flushed the whole cache), then free prop.
* Purge any cached weak links to prop (unless cx is clearing a scope,
* which must be this scope because js_*scope_clear does not nest; and
* unless we're running the gc, which already flushed the whole cache),
* then free prop.
*/
if (!cx->runtime->gcRunning)
if (!cx->clearingScope && !cx->runtime->gcRunning)
js_FlushPropertyCacheByProp(cx, (JSProperty *)sprop);
JS_free(cx, sprop);
}