Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out changeset 7d82892cb8df.

Browse Source
This commit is contained in:
Chris Leary 2011-01-27 19:43:33 -08:00
parent 263b412396
commit f5ba03208f
17 changed files with 652 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jsapi.cpp
View File

@ -648,6 +648,10 @@ JSRuntime::init(uint32 maxbytes)
}
propTreeStatFilename = getenv("JS_PROPTREE_STATFILE");
propTreeDumpFilename = getenv("JS_PROPTREE_DUMPFILE");
if (meterEmptyShapes()) {
if (!emptyShapes.init())
return false;
}
#endif
if (!(atomsCompartment = js_new<JSCompartment>(this)) ||
@ -678,7 +682,7 @@ JSRuntime::init(uint32 maxbytes)
debugMode = JS_FALSE;
return js_InitThreads(this);
return propertyTree.init() && js_InitThreads(this);
}
JSRuntime::~JSRuntime()
@ -719,6 +723,7 @@ JSRuntime::~JSRuntime()
if (debuggerLock)
JS_DESTROY_LOCK(debuggerLock);
#endif
propertyTree.finish();
}
JS_PUBLIC_API(JSRuntime *)

14
js/src/jscntxt.cpp
View File

@ -811,6 +811,19 @@ js_NewContext(JSRuntime *rt, size_t stackChunkSize)
ok = js_InitRuntimeScriptState(rt);
if (ok)
ok = js_InitRuntimeNumberState(cx);
if (ok) {
/*
* Ensure that the empty scopes initialized by
* Shape::initRuntimeState get the desired special shapes.
* (The rt->state dance above guarantees that this abuse of
* rt->shapeGen is thread-safe.)
*/
uint32 shapeGen = rt->shapeGen;
rt->shapeGen = 0;
ok = Shape::initRuntimeState(cx);
if (rt->shapeGen < shapeGen)
rt->shapeGen = shapeGen;
}
#ifdef JS_THREADSAFE
JS_EndRequest(cx);
@ -1032,6 +1045,7 @@ js_DestroyContext(JSContext *cx, JSDestroyContextMode mode)
JS_BeginRequest(cx);
#endif
Shape::finishRuntimeState(cx);
js_FinishRuntimeNumberState(cx);
/* Unpin all common atoms before final GC. */

46
js/src/jscntxt.h
View File

@ -1175,6 +1175,15 @@ struct JSRuntime {
/* Structured data callbacks are runtime-wide. */
const JSStructuredCloneCallbacks *structuredCloneCallbacks;
/*
* Shared scope property tree, and arena-pool for allocating its nodes.
* This really should be free of all locking overhead and allocated in
* thread-local storage, hence the JS_PROPERTY_TREE(cx) macro.
*/
js::PropertyTree propertyTree;
#define JS_PROPERTY_TREE(cx) ((cx)->runtime->propertyTree)
/*
* The propertyRemovals counter is incremented for every JSObject::clear,
* and for each JSObject::remove method call that frees a slot in the given
@ -1231,6 +1240,17 @@ struct JSRuntime {
/* Literal table maintained by jsatom.c functions. */
JSAtomState atomState;
/*
* Runtime-shared empty scopes for well-known built-in objects that lack
* class prototypes (the usual locus of an emptyShape). Mnemonic: ABCDEW
*/
js::EmptyShape *emptyArgumentsShape;
js::EmptyShape *emptyBlockShape;
js::EmptyShape *emptyCallShape;
js::EmptyShape *emptyDeclEnvShape;
js::EmptyShape *emptyEnumeratorShape;
js::EmptyShape *emptyWithShape;
/*
* Various metering fields are defined at the end of JSRuntime. In this
* way there is no need to recompile all the code that refers to other
@ -1256,12 +1276,18 @@ struct JSRuntime {
jsrefcount nonInlineCalls;
jsrefcount constructs;
/* Property metering. */
jsrefcount liveObjectProps;
jsrefcount liveObjectPropsPreSweep;
jsrefcount totalObjectProps;
jsrefcount livePropTreeNodes;
jsrefcount duplicatePropTreeNodes;
jsrefcount totalPropTreeNodes;
jsrefcount propTreeKidsChunks;
jsrefcount liveDictModeNodes;
/*
* NB: emptyShapes (in JSCompartment) is init'ed iff at least one
* of these envars is set:
* NB: emptyShapes is init'ed iff at least one of these envars is set:
*
* JS_PROPTREE_STATFILE statistics on the property tree forest
* JS_PROPTREE_DUMPFILE all paths in the property tree forest
@ -1271,6 +1297,12 @@ struct JSRuntime {
bool meterEmptyShapes() const { return propTreeStatFilename || propTreeDumpFilename; }
typedef js::HashSet<js::EmptyShape *,
js::DefaultHasher<js::EmptyShape *>,
js::SystemAllocPolicy> EmptyShapeSet;
EmptyShapeSet emptyShapes;
/* String instrumentation. */
jsrefcount liveStrings;
jsrefcount totalStrings;
@ -3182,19 +3214,19 @@ js_IsPropertyCacheDisabled(JSContext *cx)
}
static JS_INLINE uint32
js_RegenerateShapeForGC(JSRuntime *rt)
js_RegenerateShapeForGC(JSContext *cx)
{
JS_ASSERT(rt->gcRunning);
JS_ASSERT(rt->gcRegenShapes);
JS_ASSERT(cx->runtime->gcRunning);
JS_ASSERT(cx->runtime->gcRegenShapes);
/*
* Under the GC, compared with js_GenerateShape, we don't need to use
* atomic increments but we still must make sure that after an overflow
* the shape stays such.
*/
uint32 shape = rt->shapeGen;
uint32 shape = cx->runtime->shapeGen;
shape = (shape + 1) | (shape & js::SHAPE_OVERFLOW_BIT);
rt->shapeGen = shape;
cx->runtime->shapeGen = shape;
return shape;
}

39
js/src/jscompartment.cpp
View File

@ -64,7 +64,6 @@ JSCompartment::JSCompartment(JSRuntime *rt)
data(NULL),
marked(false),
active(false),
propertyTree(this),
debugMode(rt->debugMode),
mathCache(NULL)
{
@ -75,9 +74,6 @@ JSCompartment::JSCompartment(JSRuntime *rt)
JSCompartment::~JSCompartment()
{
Shape::finishEmptyShapes(this);
propertyTree.finish();
#if ENABLE_YARR_JIT
js_delete(regExpAllocator);
#endif
@ -111,22 +107,10 @@ JSCompartment::init()
if (!crossCompartmentWrappers.init())
return false;
if (!propertyTree.init())
return false;
#ifdef DEBUG
if (rt->meterEmptyShapes()) {
if (!emptyShapes.init())
return false;
}
#endif
if (!Shape::initEmptyShapes(this))
return false;
#ifdef JS_TRACER
if (!InitJIT(&traceMonitor))
if (!InitJIT(&traceMonitor)) {
return false;
}
#endif
#if ENABLE_YARR_JIT
@ -403,29 +387,12 @@ ScriptPoolDestroyed(JSContext *cx, mjit::JITScript *jit,
#endif
void
JSCompartment::markCrossCompartment(JSTracer *trc)
JSCompartment::mark(JSTracer *trc)
{
for (WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront())
MarkValue(trc, e.front().key, "cross-compartment wrapper");
}
void
JSCompartment::mark(JSTracer *trc)
{
if (emptyArgumentsShape)
emptyArgumentsShape->trace(trc);
if (emptyBlockShape)
emptyBlockShape->trace(trc);
if (emptyCallShape)
emptyCallShape->trace(trc);
if (emptyDeclEnvShape)
emptyDeclEnvShape->trace(trc);
if (emptyEnumeratorShape)
emptyEnumeratorShape->trace(trc);
if (emptyWithShape)
emptyWithShape->trace(trc);
}
void
JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
{

48
js/src/jscompartment.h
View File

@ -398,36 +398,6 @@ struct JS_FRIEND_API(JSCompartment) {
js::mjit::JaegerCompartment *jaegerCompartment;
#endif
/*
* Shared scope property tree, and arena-pool for allocating its nodes.
*/
js::PropertyTree propertyTree;
#ifdef DEBUG
/* Property metering. */
jsrefcount livePropTreeNodes;
jsrefcount totalPropTreeNodes;
jsrefcount propTreeKidsChunks;
jsrefcount liveDictModeNodes;
#endif
/*
* Runtime-shared empty scopes for well-known built-in objects that lack
* class prototypes (the usual locus of an emptyShape). Mnemonic: ABCDEW
*/
js::EmptyShape *emptyArgumentsShape;
js::EmptyShape *emptyBlockShape;
js::EmptyShape *emptyCallShape;
js::EmptyShape *emptyDeclEnvShape;
js::EmptyShape *emptyEnumeratorShape;
js::EmptyShape *emptyWithShape;
typedef js::HashSet<js::EmptyShape *,
js::DefaultHasher<js::EmptyShape *>,
js::SystemAllocPolicy> EmptyShapeSet;
EmptyShapeSet emptyShapes;
bool debugMode; // true iff debug mode on
JSCList scripts; // scripts in this compartment
@ -435,17 +405,12 @@ struct JS_FRIEND_API(JSCompartment) {
js::NativeIterCache nativeIterCache;
JSCompartment(JSRuntime *rt);
JSCompartment(JSRuntime *cx);
~JSCompartment();
bool init();
/* Mark cross-compartment pointers. */
void markCrossCompartment(JSTracer *trc);
/* Mark this compartment's local roots. */
void mark(JSTracer *trc);
bool wrap(JSContext *cx, js::Value *vp);
bool wrap(JSContext *cx, JSString **strp);
bool wrap(JSContext *cx, JSObject **objp);
@ -476,15 +441,8 @@ struct JS_FRIEND_API(JSCompartment) {
}
};
#define JS_TRACE_MONITOR(cx) ((cx)->compartment->traceMonitor)
#define JS_SCRIPTS_TO_GC(cx) ((cx)->compartment->scriptsToGC)
#define JS_PROPERTY_TREE(cx) ((cx)->compartment->propertyTree)
#ifdef DEBUG
#define JS_COMPARTMENT_METER(x) x
#else
#define JS_COMPARTMENT_METER(x)
#endif
#define JS_TRACE_MONITOR(cx) (cx->compartment->traceMonitor)
#define JS_SCRIPTS_TO_GC(cx) (cx->compartment->scriptsToGC)
namespace js {
static inline MathCache *

6
js/src/jsdbgapi.cpp
View File

@ -595,12 +595,6 @@ DropWatchPointAndUnlock(JSContext *cx, JSWatchPoint *wp, uintN flag)
return ok;
}
/*
* Switch to the same compartment as the watch point, since changeProperty, below,
* needs to have a compartment.
*/
SwitchToCompartment sc(cx, wp->object);
/* Remove wp from the list, then restore wp->shape->setter from wp. */
++rt->debuggerMutations;
JS_REMOVE_LINK(&wp->links);

4
js/src/jsfun.cpp
View File

@ -201,7 +201,7 @@ NewArguments(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee)
: &js_ArgumentsClass,
proto, parent, NULL, false);
argsobj->setMap(cx->compartment->emptyArgumentsShape);
argsobj->setMap(cx->runtime->emptyArgumentsShape);
argsobj->setArgsLength(argc);
argsobj->setArgsData(data);
@ -989,7 +989,7 @@ NewDeclEnvObject(JSContext *cx, JSStackFrame *fp)
return NULL;
envobj->init(cx, &js_DeclEnvClass, NULL, &fp->scopeChain(), fp, false);
envobj->setMap(cx->compartment->emptyDeclEnvShape);
envobj->setMap(cx->runtime->emptyDeclEnvShape);
return envobj;
}

55
js/src/jsgc.cpp
View File

@ -854,7 +854,7 @@ js_FinishGC(JSRuntime *rt)
js_DumpGCStats(rt, stdout);
#endif
/* Delete all remaining Compartments. */
/* Delete all remaining Compartments. Ideally only the atomsCompartment should be left. */
for (JSCompartment **c = rt->compartments.begin(); c != rt->compartments.end(); ++c) {
JSCompartment *comp = *c;
comp->finishArenaLists();
@ -1027,6 +1027,7 @@ JSRuntime::setGCTriggerFactor(uint32 factor)
for (JSCompartment **c = compartments.begin(); c != compartments.end(); ++c) {
(*c)->setGCLastBytes(gcLastBytes);
}
atomsCompartment->setGCLastBytes(gcLastBytes);
}
void
@ -1730,6 +1731,19 @@ MarkRuntime(JSTracer *trc)
for (ThreadDataIter i(rt); !i.empty(); i.popFront())
i.threadData()->mark(trc);
if (rt->emptyArgumentsShape)
rt->emptyArgumentsShape->trace(trc);
if (rt->emptyBlockShape)
rt->emptyBlockShape->trace(trc);
if (rt->emptyCallShape)
rt->emptyCallShape->trace(trc);
if (rt->emptyDeclEnvShape)
rt->emptyDeclEnvShape->trace(trc);
if (rt->emptyEnumeratorShape)
rt->emptyEnumeratorShape->trace(trc);
if (rt->emptyWithShape)
rt->emptyWithShape->trace(trc);
/*
* We mark extra roots at the last thing so it can use use additional
* colors to implement cycle collection.
@ -2233,7 +2247,7 @@ PreGCCleanup(JSContext *cx, JSGCInvocationKind gckind)
#endif
) {
rt->gcRegenShapes = true;
rt->shapeGen = 0;
rt->shapeGen = Shape::LAST_RESERVED_SHAPE;
rt->protoHazardShape = 0;
}
@ -2273,9 +2287,7 @@ MarkAndSweepCompartment(JSContext *cx, JSCompartment *comp, JSGCInvocationKind g
r.front()->clearMarkBitmap();
for (JSCompartment **c = rt->compartments.begin(); c != rt->compartments.end(); ++c)
(*c)->markCrossCompartment(&gcmarker);
comp->mark(&gcmarker);
(*c)->mark(&gcmarker);
MarkRuntime(&gcmarker);
@ -2346,13 +2358,11 @@ MarkAndSweepCompartment(JSContext *cx, JSCompartment *comp, JSGCInvocationKind g
comp->finalizeStringArenaLists(cx);
TIMESTAMP(sweepStringEnd);
#ifdef DEBUG
/* Make sure that we didn't mark a Shape in another compartment. */
for (JSCompartment **c = rt->compartments.begin(); c != rt->compartments.end(); ++c) {
JS_ASSERT_IF(*c != comp, (*c)->propertyTree.checkShapesAllUnmarked(cx));
}
comp->propertyTree.dumpShapes(cx);
#endif
/*
* Unmark the runtime's property trees because we don't
* sweep them.
*/
js::PropertyTree::unmarkShapes(cx);
/*
* Destroy arenas after we finished the sweeping so finalizers can safely
@ -2390,9 +2400,6 @@ MarkAndSweep(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
for (GCChunkSet::Range r(rt->gcChunkSet.all()); !r.empty(); r.popFront())
r.front()->clearMarkBitmap();
for (JSCompartment **c = rt->compartments.begin(); c != rt->compartments.end(); ++c)
(*c)->mark(&gcmarker);
MarkRuntime(&gcmarker);
js_MarkScriptFilenames(rt);
@ -2462,19 +2469,13 @@ MarkAndSweep(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
TIMESTAMP(sweepStringEnd);
SweepCompartments(cx, gckind);
/*
* Sweep the runtime's property trees after finalizing objects, in case any
* had watchpoints referencing tree nodes.
*
* Do this before sweeping compartments, so that we sweep all shapes in
* unreachable compartments.
*/
for (JSCompartment **c = rt->compartments.begin(); c != rt->compartments.end(); ++c) {
(*c)->propertyTree.sweepShapes(cx);
(*c)->propertyTree.dumpShapes(cx);
}
SweepCompartments(cx, gckind);
js::PropertyTree::sweepShapes(cx);
/*
* Sweep script filenames after sweeping functions in the generic loop
@ -2701,12 +2702,6 @@ GCUntilDone(JSContext *cx, JSCompartment *comp, JSGCInvocationKind gckind GCTIM
AutoGCSession gcsession(cx);
/*
* We should not be depending on cx->compartment in the GC, so set it to
* NULL to look for violations.
*/
SwitchToCompartment(cx, (JSCompartment *)NULL);
JS_ASSERT(!rt->gcCurrentCompartment);
rt->gcCurrentCompartment = comp;

2
js/src/jsiter.cpp
View File

@ -427,7 +427,7 @@ NewIteratorObject(JSContext *cx, uintN flags)
if (!obj)
return false;
obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
obj->setMap(cx->compartment->emptyEnumeratorShape);
obj->setMap(cx->runtime->emptyEnumeratorShape);
return obj;
}

6
js/src/jsobj.cpp
View File

@ -3209,7 +3209,7 @@ js_NewWithObject(JSContext *cx, JSObject *proto, JSObject *parent, jsint depth)
JSStackFrame *priv = js_FloatingFrameIfGenerator(cx, cx->fp());
obj->init(cx, &js_WithClass, proto, parent, priv, false);
obj->setMap(cx->compartment->emptyWithShape);
obj->setMap(cx->runtime->emptyWithShape);
OBJ_SET_BLOCK_DEPTH(cx, obj, depth);
AutoObjectRooter tvr(cx, obj);
@ -3235,7 +3235,7 @@ js_NewBlockObject(JSContext *cx)
return NULL;
blockObj->init(cx, &js_BlockClass, NULL, NULL, NULL, false);
blockObj->setMap(cx->compartment->emptyBlockShape);
blockObj->setMap(cx->runtime->emptyBlockShape);
return blockObj;
}
@ -4646,7 +4646,7 @@ js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, const Value &valu
* member declaration.
*/
if (obj->isDelegate() && (attrs & (JSPROP_READONLY | JSPROP_SETTER)))
cx->runtime->protoHazardShape = js_GenerateShape(cx);
cx->runtime->protoHazardShape = js_GenerateShape(cx, false);
/* Use the object's class getter and setter by default. */
clasp = obj->getClass();

4
js/src/jsobj.h
View File

@ -316,10 +316,6 @@ struct JSObject : js::gc::Cell {
* for DictionaryProperties assert that the scope is in dictionary mode and
* any reachable properties are flagged as dictionary properties.
*
* For native objects, this field is always a Shape. For non-native objects,
* it points to the singleton sharedNonNative JSObjectMap, whose shape field
* is SHAPELESS.
*
* NB: these private methods do *not* update this scope's shape to track
* lastProp->shape after they finish updating the linked list in the case
* where lastProp is updated. It is up to calling code in jsscope.cpp to

644
js/src/jspropertytree.cpp
View File

@ -79,62 +79,69 @@ PropertyTree::finish()
JS_FinishArenaPool(&arenaPool);
}
/* On failure, returns NULL. Does not report out of memory. */
/*
* NB: Called with cx->runtime->gcLock held if gcLocked is true.
* On failure, return null after unlocking the GC and reporting out of memory.
*/
Shape *
PropertyTree::newShapeUnchecked()
PropertyTree::newShape(JSContext *cx, bool gcLocked)
{
Shape *shape;
if (!gcLocked)
JS_LOCK_GC(cx->runtime);
shape = freeList;
if (shape) {
shape->removeFree();
} else {
JS_ARENA_ALLOCATE_CAST(shape, Shape *, &arenaPool, sizeof(Shape));
if (!shape)
if (!shape) {
JS_UNLOCK_GC(cx->runtime);
JS_ReportOutOfMemory(cx);
return NULL;
}
}
if (!gcLocked)
JS_UNLOCK_GC(cx->runtime);
#ifdef DEBUG
shape->compartment = compartment;
#endif
JS_COMPARTMENT_METER(compartment->livePropTreeNodes++);
JS_COMPARTMENT_METER(compartment->totalPropTreeNodes++);
JS_RUNTIME_METER(cx->runtime, livePropTreeNodes);
JS_RUNTIME_METER(cx->runtime, totalPropTreeNodes);
return shape;
}
Shape *
PropertyTree::newShape(JSContext *cx)
/*
* NB: Called with cx->runtime->gcLock held, always.
* On failure, return null after unlocking the GC and reporting out of memory.
*/
KidsChunk *
KidsChunk::create(JSContext *cx)
{
Shape *shape = newShapeUnchecked();
if (!shape)
KidsChunk *chunk;
chunk = (KidsChunk *) js_calloc(sizeof *chunk);
if (!chunk) {
JS_UNLOCK_GC(cx->runtime);
JS_ReportOutOfMemory(cx);
return shape;
}
static KidsHash *
HashChildren(Shape *kid1, Shape *kid2)
{
void *mem = js_malloc(sizeof(KidsHash));
if (!mem)
return NULL;
KidsHash *hash = new (mem) KidsHash();
if (!hash->init(2)) {
js_free(hash);
return NULL;
}
KidsHash::AddPtr addPtr = hash->lookupForAdd(kid1);
JS_ALWAYS_TRUE(hash->add(addPtr, kid1));
addPtr = hash->lookupForAdd(kid2);
JS_ASSERT(!addPtr.found());
JS_ALWAYS_TRUE(hash->add(addPtr, kid2));
return hash;
JS_RUNTIME_METER(cx->runtime, propTreeKidsChunks);
return chunk;
}
KidsChunk *
KidsChunk::destroy(JSContext *cx, KidsChunk *chunk)
{
JS_RUNTIME_UNMETER(cx->runtime, propTreeKidsChunks);
KidsChunk *nextChunk = chunk->next;
js_free(chunk);
return nextChunk;
}
/*
* NB: Called with cx->runtime->gcLock held, always.
* On failure, return false after unlocking the GC and reporting out of memory.
*/
bool
PropertyTree::insertChild(JSContext *cx, Shape *parent, Shape *child)
{
@ -143,45 +150,89 @@ PropertyTree::insertChild(JSContext *cx, Shape *parent, Shape *child)
JS_ASSERT(!child->inDictionary());
JS_ASSERT(!JSID_IS_VOID(parent->id));
JS_ASSERT(!JSID_IS_VOID(child->id));
JS_ASSERT(cx->compartment == compartment);
JS_ASSERT(child->compartment == parent->compartment);
child->setParent(parent);
KidsPointer *kidp = &parent->kids;
if (kidp->isNull()) {
child->setParent(parent);
kidp->setShape(child);
return true;
}
if (kidp->isShape()) {
Shape *shape = kidp->toShape();
JS_ASSERT(shape != child);
JS_ASSERT(!shape->matches(child));
Shape *shape;
KidsHash *hash = HashChildren(shape, child);
if (!hash) {
JS_ReportOutOfMemory(cx);
return false;
if (kidp->isShape()) {
shape = kidp->toShape();
JS_ASSERT(shape != child);
if (shape->matches(child)) {
/*
* Duplicate child created while racing to getChild on the same
* node label. See PropertyTree::getChild, further below.
*/
JS_RUNTIME_METER(cx->runtime, duplicatePropTreeNodes);
}
kidp->setHash(hash);
child->setParent(parent);
KidsChunk *chunk = KidsChunk::create(cx);
if (!chunk)
return false;
parent->kids.setChunk(chunk);
chunk->kids[0] = shape;
chunk->kids[1] = child;
return true;
}
if (kidp->isChunk()) {
KidsChunk **chunkp;
KidsChunk *chunk = kidp->toChunk();
do {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
shape = chunk->kids[i];
if (!shape) {
chunk->kids[i] = child;
return true;
}
JS_ASSERT(shape != child);
if (shape->matches(child)) {
/*
* Duplicate child, see comment above. In this case, we
* must let the duplicate be inserted at this level in the
* tree, so we keep iterating, looking for an empty slot in
* which to insert.
*/
JS_ASSERT(shape != child);
JS_RUNTIME_METER(cx->runtime, duplicatePropTreeNodes);
}
}
chunkp = &chunk->next;
} while ((chunk = *chunkp) != NULL);
chunk = KidsChunk::create(cx);
if (!chunk)
return false;
*chunkp = chunk;
chunk->kids[0] = child;
return true;
}
KidsHash *hash = kidp->toHash();
KidsHash::AddPtr addPtr = hash->lookupForAdd(child);
JS_ASSERT(!addPtr.found());
if (!hash->add(addPtr, child)) {
JS_ReportOutOfMemory(cx);
return false;
if (!addPtr) {
if (!hash->add(addPtr, child)) {
JS_UNLOCK_GC(cx->runtime);
JS_ReportOutOfMemory(cx);
return false;
}
} else {
// FIXME ignore duplicate child case here, going thread-local soon!
}
child->setParent(parent);
return true;
}
/* NB: Called with cx->runtime->gcLock held. */
void
PropertyTree::removeChild(Shape *child)
PropertyTree::removeChild(JSContext *cx, Shape *child)
{
JS_ASSERT(!child->inDictionary());
@ -197,9 +248,97 @@ PropertyTree::removeChild(Shape *child)
return;
}
if (kidp->isChunk()) {
KidsChunk *list = kidp->toChunk();
KidsChunk *chunk = list;
KidsChunk **chunkp = &list;
do {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
if (chunk->kids[i] == child) {
KidsChunk *lastChunk = chunk;
uintN j;
if (!lastChunk->next) {
j = i + 1;
} else {
j = 0;
do {
chunkp = &lastChunk->next;
lastChunk = *chunkp;
} while (lastChunk->next);
}
for (; j < MAX_KIDS_PER_CHUNK; j++) {
if (!lastChunk->kids[j])
break;
}
--j;
if (chunk != lastChunk || j > i)
chunk->kids[i] = lastChunk->kids[j];
lastChunk->kids[j] = NULL;
if (j == 0) {
*chunkp = NULL;
if (!list)
parent->kids.setNull();
KidsChunk::destroy(cx, lastChunk);
}
return;
}
}
chunkp = &chunk->next;
} while ((chunk = *chunkp) != NULL);
return;
}
kidp->toHash()->remove(child);
}
static KidsHash *
HashChunks(KidsChunk *chunk, uintN n)
{
void *mem = js_malloc(sizeof(KidsHash));
if (!mem)
return NULL;
KidsHash *hash = new (mem) KidsHash();
if (!hash->init(n)) {
js_free(hash);
return NULL;
}
do {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
Shape *shape = chunk->kids[i];
if (!shape)
break;
KidsHash::AddPtr addPtr = hash->lookupForAdd(shape);
if (!addPtr) {
/*
* Infallible, we right-sized via hash->init(n) just above.
* Assert just in case jshashtable.h ever regresses.
*/
JS_ALWAYS_TRUE(hash->add(addPtr, shape));
} else {
/*
* Duplicate child case, we don't handle this race,
* multi-threaded shapes are going away...
*/
}
}
} while ((chunk = chunk->next) != NULL);
return hash;
}
/*
* Called without cx->runtime->gcLock held. This function acquires that lock
* only when inserting a new child. Thus there may be races to find or add a
* node that result in duplicates. We expect such races to be rare!
*
* We use cx->runtime->gcLock, not ...->rtLock, to avoid nesting the former
* inside the latter in js_GenerateShape below.
*/
Shape *
PropertyTree::getChild(JSContext *cx, Shape *parent, const Shape &child)
{
@ -209,36 +348,95 @@ PropertyTree::getChild(JSContext *cx, Shape *parent, const Shape &child)
JS_ASSERT(!JSID_IS_VOID(parent->id));
/*
* The property tree has extremely low fan-out below its root in
* popular embeddings with real-world workloads. Patterns such as
* defining closures that capture a constructor's environment as
* getters or setters on the new object that is passed in as
* |this| can significantly increase fan-out below the property
* Because chunks are appended at the end and never deleted except by
* the GC, we can search without taking the runtime's GC lock. We may
* miss a matching shape added by another thread, and make a duplicate
* one, but that is an unlikely, therefore small, cost. The property
* tree has extremely low fan-out below its root in popular embeddings
* with real-world workloads.
*
* Patterns such as defining closures that capture a constructor's
* environment as getters or setters on the new object that is passed
* in as |this| can significantly increase fan-out below the property
* tree root -- see bug 335700 for details.
*/
KidsPointer *kidp = &parent->kids;
if (kidp->isShape()) {
shape = kidp->toShape();
if (shape->matches(&child))
return shape;
} else if (kidp->isHash()) {
shape = *kidp->toHash()->lookup(&child);
if (shape)
return shape;
} else {
/* If kidp->isNull(), we always insert. */
if (!kidp->isNull()) {
if (kidp->isShape()) {
shape = kidp->toShape();
if (shape->matches(&child))
return shape;
} else if (kidp->isChunk()) {
KidsChunk *chunk = kidp->toChunk();
uintN n = 0;
do {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
shape = chunk->kids[i];
if (!shape) {
n += i;
if (n >= CHUNK_HASH_THRESHOLD) {
/*
* kidp->isChunk() was true, but if we're racing it
* may not be by this point. FIXME: thread "safety"
* is for the birds!
*/
if (!kidp->isHash()) {
chunk = kidp->toChunk();
KidsHash *hash = HashChunks(chunk, n);
if (!hash) {
JS_ReportOutOfMemory(cx);
return NULL;
}
JS_LOCK_GC(cx->runtime);
if (kidp->isHash()) {
hash->~KidsHash();
js_free(hash);
} else {
// FIXME unsafe race with kidp->is/toChunk() above.
// But this is all going single-threaded soon...
while (chunk)
chunk = KidsChunk::destroy(cx, chunk);
kidp->setHash(hash);
}
goto locked_not_found;
}
}
goto not_found;
}
if (shape->matches(&child))
return shape;
}
n += MAX_KIDS_PER_CHUNK;
} while ((chunk = chunk->next) != NULL);
} else {
JS_LOCK_GC(cx->runtime);
shape = *kidp->toHash()->lookup(&child);
if (shape)
goto out;
goto locked_not_found;
}
}
shape = newShape(cx);
not_found:
JS_LOCK_GC(cx->runtime);
locked_not_found:
shape = newShape(cx, true);
if (!shape)
return NULL;
new (shape) Shape(child.id, child.rawGetter, child.rawSetter, child.slot, child.attrs,
child.flags, child.shortid, js_GenerateShape(cx));
child.flags, child.shortid, js_GenerateShape(cx, true));
if (!insertChild(cx, parent, shape))
return NULL;
out:
JS_UNLOCK_GC(cx->runtime);
return shape;
}
@ -249,6 +447,23 @@ KidsPointer::checkConsistency(const Shape *aKid) const
{
if (isShape()) {
JS_ASSERT(toShape() == aKid);
} else if (isChunk()) {
bool found = false;
for (KidsChunk *chunk = toChunk(); chunk; chunk = chunk->next) {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
if (!chunk->kids[i]) {
JS_ASSERT(!chunk->next);
for (uintN j = i + 1; j < MAX_KIDS_PER_CHUNK; j++)
JS_ASSERT(!chunk->kids[j]);
break;
}
if (chunk->kids[i] == aKid) {
JS_ASSERT(!found);
found = true;
}
}
}
JS_ASSERT(found);
} else {
JS_ASSERT(isHash());
KidsHash *hash = toHash();
@ -326,17 +541,29 @@ void
js::PropertyTree::meter(JSBasicStats *bs, Shape *node)
{
uintN nkids = 0;
const KidsPointer &kidp = node->kids;
if (kidp.isShape()) {
meter(bs, kidp.toShape());
nkids = 1;
} else if (kidp.isHash()) {
const KidsHash &hash = *kidp.toHash();
for (KidsHash::Range range = hash.all(); !range.empty(); range.popFront()) {
Shape *kid = range.front();
meter(bs, kid);
nkids++;
const KidsPointer &kids = node->kids;
if (!kids.isNull()) {
if (kids.isShape()) {
meter(bs, kids.toShape());
nkids = 1;
} else if (kids.isChunk()) {
for (KidsChunk *chunk = kids.toChunk(); chunk; chunk = chunk->next) {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
Shape *kid = chunk->kids[i];
if (!kid)
break;
meter(bs, kid);
nkids++;
}
}
} else {
const KidsHash &hash = *kids.toHash();
for (KidsHash::Range range = hash.all(); !range.empty(); range.popFront()) {
Shape *kid = range.front();
meter(bs, kid);
nkids++;
}
}
}
@ -361,6 +588,17 @@ Shape::dumpSubtree(JSContext *cx, int level, FILE *fp) const
Shape *kid = kids.toShape();
JS_ASSERT(kid->parent == this);
kid->dumpSubtree(cx, level, fp);
} else if (kids.isChunk()) {
KidsChunk *chunk = kids.toChunk();
do {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
Shape *kid = chunk->kids[i];
if (!kid)
break;
JS_ASSERT(kid->parent == this);
kid->dumpSubtree(cx, level, fp);
}
} while ((chunk = chunk->next) != NULL);
} else {
const KidsHash &hash = *kids.toHash();
for (KidsHash::Range range = hash.all(); !range.empty(); range.popFront()) {
@ -376,12 +614,20 @@ Shape::dumpSubtree(JSContext *cx, int level, FILE *fp) const
#endif /* DEBUG */
JS_ALWAYS_INLINE void
js::PropertyTree::orphanChildren(Shape *shape)
js::PropertyTree::orphanKids(JSContext *cx, Shape *shape)
{
KidsPointer *kidp = &shape->kids;
JS_ASSERT(!kidp->isNull());
/*
* Note that JS_PROPERTY_TREE(cx).removeChild(cx, shape) precedes the call
* to orphanKids in sweepShapes, below. Therefore the grandparent must have
* either no kids left, or else space in chunks or a hash for more than one
* kid.
*/
JS_ASSERT_IF(shape->parent, !shape->parent->kids.isShape());
if (kidp->isShape()) {
Shape *kid = kidp->toShape();
@ -389,6 +635,21 @@ js::PropertyTree::orphanChildren(Shape *shape)
JS_ASSERT(kid->parent == shape);
kid->parent = NULL;
}
} else if (kidp->isChunk()) {
KidsChunk *chunk = kidp->toChunk();
do {
for (uintN i = 0; i < MAX_KIDS_PER_CHUNK; i++) {
Shape *kid = chunk->kids[i];
if (!kid)
break;
if (!JSID_IS_VOID(kid->id)) {
JS_ASSERT(kid->parent == shape);
kid->parent = NULL;
}
}
} while ((chunk = KidsChunk::destroy(cx, chunk)) != NULL);
} else {
KidsHash *hash = kidp->toHash();
@ -410,14 +671,12 @@ js::PropertyTree::orphanChildren(Shape *shape)
void
js::PropertyTree::sweepShapes(JSContext *cx)
{
JSRuntime *rt = compartment->rt;
#ifdef DEBUG
JSBasicStats bs;
uint32 livePropCapacity = 0, totalLiveCount = 0;
static FILE *logfp;
if (!logfp) {
if (const char *filename = rt->propTreeStatFilename)
if (const char *filename = cx->runtime->propTreeStatFilename)
logfp = fopen(filename, "w");
}
@ -426,18 +685,18 @@ js::PropertyTree::sweepShapes(JSContext *cx)
uint32 empties;
{
typedef JSCompartment::EmptyShapeSet HS;
typedef JSRuntime::EmptyShapeSet HS;
HS &h = compartment->emptyShapes;
HS &h = cx->runtime->emptyShapes;
empties = h.count();
MeterKidCount(&bs, empties);
for (HS::Range r = h.all(); !r.empty(); r.popFront())
meter(&bs, r.front());
}
double props = rt->liveObjectPropsPreSweep;
double nodes = compartment->livePropTreeNodes;
double dicts = compartment->liveDictModeNodes;
double props = cx->runtime->liveObjectPropsPreSweep;
double nodes = cx->runtime->livePropTreeNodes;
double dicts = cx->runtime->liveDictModeNodes;
/* Empty scope nodes are never hashed, so subtract them from nodes. */
JS_ASSERT(nodes - dicts == bs.sum);
@ -459,7 +718,7 @@ js::PropertyTree::sweepShapes(JSContext *cx)
* already GC'ed from the root ply, but we will avoid re-orphaning their
* kids, because the kids member will already be null.
*/
JSArena **ap = &arenaPool.first.next;
JSArena **ap = &JS_PROPERTY_TREE(cx).arenaPool.first.next;
while (JSArena *a = *ap) {
Shape *limit = (Shape *) a->avail;
uintN liveCount = 0;
@ -479,11 +738,11 @@ js::PropertyTree::sweepShapes(JSContext *cx)
*/
if (shape->marked()) {
shape->clearMark();
if (rt->gcRegenShapes) {
if (cx->runtime->gcRegenShapes) {
if (shape->hasRegenFlag())
shape->clearRegenFlag();
else
shape->shape = js_RegenerateShapeForGC(rt);
shape->shape = js_RegenerateShapeForGC(cx);
}
liveCount++;
continue;
@ -491,18 +750,18 @@ js::PropertyTree::sweepShapes(JSContext *cx)
#ifdef DEBUG
if ((shape->flags & Shape::SHARED_EMPTY) &&
rt->meterEmptyShapes()) {
compartment->emptyShapes.remove((EmptyShape *) shape);
cx->runtime->meterEmptyShapes()) {
cx->runtime->emptyShapes.remove((EmptyShape *) shape);
}
#endif
if (shape->inDictionary()) {
JS_COMPARTMENT_METER(compartment->liveDictModeNodes--);
JS_RUNTIME_UNMETER(cx->runtime, liveDictModeNodes);
} else {
/*
* Here, shape is garbage to collect, but its parent might not
* be, so we may have to remove it from its parent's kids hash
* or kid singleton pointer set.
* be, so we may have to remove it from its parent's kids hash,
* chunk list, or kid singleton pointer set.
*
* Without a separate mark-clearing pass, we can't tell whether
* shape->parent is live at this point, so we must remove shape
@ -512,10 +771,10 @@ js::PropertyTree::sweepShapes(JSContext *cx)
* tree node's kids' parent links when sweeping that node.
*/
if (shape->parent)
removeChild(shape);
JS_PROPERTY_TREE(cx).removeChild(cx, shape);
if (!shape->kids.isNull())
orphanChildren(shape);
orphanKids(cx, shape);
}
/*
@ -523,15 +782,15 @@ js::PropertyTree::sweepShapes(JSContext *cx)
* shape is on the freelist.
*/
shape->freeTable(cx);
shape->insertFree(&freeList);
JS_COMPARTMENT_METER(compartment->livePropTreeNodes--);
shape->insertFree(&JS_PROPERTY_TREE(cx).freeList);
JS_RUNTIME_UNMETER(cx->runtime, livePropTreeNodes);
}
/* If a contains no live properties, return it to the malloc heap. */
if (liveCount == 0) {
for (Shape *shape = (Shape *) a->base; shape < limit; shape++)
shape->removeFree();
JS_ARENA_DESTROY(&arenaPool, a, ap);
JS_ARENA_DESTROY(&JS_PROPERTY_TREE(cx).arenaPool, a, ap);
} else {
#ifdef DEBUG
livePropCapacity += limit - (Shape *) a->base;
@ -545,7 +804,7 @@ js::PropertyTree::sweepShapes(JSContext *cx)
if (logfp) {
fprintf(logfp,
"\nProperty tree stats for gcNumber %lu\n",
(unsigned long) rt->gcNumber);
(unsigned long) cx->runtime->gcNumber);
fprintf(logfp, "arenautil %g%%\n",
(totalLiveCount && livePropCapacity)
@ -554,109 +813,77 @@ js::PropertyTree::sweepShapes(JSContext *cx)
#define RATE(f1, f2) (((double)js_scope_stats.f1 / js_scope_stats.f2) * 100.0)
/* This data is global, so only print it once per GC. */
if (compartment == rt->atomsCompartment) {
fprintf(logfp,
"Scope search stats:\n"
" searches: %6u\n"
" hits: %6u %5.2f%% of searches\n"
" misses: %6u %5.2f%%\n"
" hashes: %6u %5.2f%%\n"
" hashHits: %6u %5.2f%% (%5.2f%% of hashes)\n"
" hashMisses: %6u %5.2f%% (%5.2f%%)\n"
" steps: %6u %5.2f%% (%5.2f%%)\n"
" stepHits: %6u %5.2f%% (%5.2f%%)\n"
" stepMisses: %6u %5.2f%% (%5.2f%%)\n"
" initSearches: %6u\n"
" changeSearches: %6u\n"
" tableAllocFails: %6u\n"
" toDictFails: %6u\n"
" wrapWatchFails: %6u\n"
" adds: %6u\n"
" addFails: %6u\n"
" puts: %6u\n"
" redundantPuts: %6u\n"
" putFails: %6u\n"
" changes: %6u\n"
" changeFails: %6u\n"
" compresses: %6u\n"
" grows: %6u\n"
" removes: %6u\n"
" removeFrees: %6u\n"
" uselessRemoves: %6u\n"
" shrinks: %6u\n",
js_scope_stats.searches,
js_scope_stats.hits, RATE(hits, searches),
js_scope_stats.misses, RATE(misses, searches),
js_scope_stats.hashes, RATE(hashes, searches),
js_scope_stats.hashHits, RATE(hashHits, searches), RATE(hashHits, hashes),
js_scope_stats.hashMisses, RATE(hashMisses, searches), RATE(hashMisses, hashes),
js_scope_stats.steps, RATE(steps, searches), RATE(steps, hashes),
js_scope_stats.stepHits, RATE(stepHits, searches), RATE(stepHits, hashes),
js_scope_stats.stepMisses, RATE(stepMisses, searches), RATE(stepMisses, hashes),
js_scope_stats.initSearches,
js_scope_stats.changeSearches,
js_scope_stats.tableAllocFails,
js_scope_stats.toDictFails,
js_scope_stats.wrapWatchFails,
js_scope_stats.adds,
js_scope_stats.addFails,
js_scope_stats.puts,
js_scope_stats.redundantPuts,
js_scope_stats.putFails,
js_scope_stats.changes,
js_scope_stats.changeFails,
js_scope_stats.compresses,
js_scope_stats.grows,
js_scope_stats.removes,
js_scope_stats.removeFrees,
js_scope_stats.uselessRemoves,
js_scope_stats.shrinks);
}
fprintf(logfp,
"Scope search stats:\n"
" searches: %6u\n"
" hits: %6u %5.2f%% of searches\n"
" misses: %6u %5.2f%%\n"
" hashes: %6u %5.2f%%\n"
" hashHits: %6u %5.2f%% (%5.2f%% of hashes)\n"
" hashMisses: %6u %5.2f%% (%5.2f%%)\n"
" steps: %6u %5.2f%% (%5.2f%%)\n"
" stepHits: %6u %5.2f%% (%5.2f%%)\n"
" stepMisses: %6u %5.2f%% (%5.2f%%)\n"
" initSearches: %6u\n"
" changeSearches: %6u\n"
" tableAllocFails: %6u\n"
" toDictFails: %6u\n"
" wrapWatchFails: %6u\n"
" adds: %6u\n"
" addFails: %6u\n"
" puts: %6u\n"
" redundantPuts: %6u\n"
" putFails: %6u\n"
" changes: %6u\n"
" changeFails: %6u\n"
" compresses: %6u\n"
" grows: %6u\n"
" removes: %6u\n"
" removeFrees: %6u\n"
" uselessRemoves: %6u\n"
" shrinks: %6u\n",
js_scope_stats.searches,
js_scope_stats.hits, RATE(hits, searches),
js_scope_stats.misses, RATE(misses, searches),
js_scope_stats.hashes, RATE(hashes, searches),
js_scope_stats.hashHits, RATE(hashHits, searches), RATE(hashHits, hashes),
js_scope_stats.hashMisses, RATE(hashMisses, searches), RATE(hashMisses, hashes),
js_scope_stats.steps, RATE(steps, searches), RATE(steps, hashes),
js_scope_stats.stepHits, RATE(stepHits, searches), RATE(stepHits, hashes),
js_scope_stats.stepMisses, RATE(stepMisses, searches), RATE(stepMisses, hashes),
js_scope_stats.initSearches,
js_scope_stats.changeSearches,
js_scope_stats.tableAllocFails,
js_scope_stats.toDictFails,
js_scope_stats.wrapWatchFails,
js_scope_stats.adds,
js_scope_stats.addFails,
js_scope_stats.puts,
js_scope_stats.redundantPuts,
js_scope_stats.putFails,
js_scope_stats.changes,
js_scope_stats.changeFails,
js_scope_stats.compresses,
js_scope_stats.grows,
js_scope_stats.removes,
js_scope_stats.removeFrees,
js_scope_stats.uselessRemoves,
js_scope_stats.shrinks);
#undef RATE
fflush(logfp);
}
#endif /* DEBUG */
}
bool
js::PropertyTree::checkShapesAllUnmarked(JSContext *cx)
{
JSArena **ap = &arenaPool.first.next;
while (JSArena *a = *ap) {
Shape *limit = (Shape *) a->avail;
for (Shape *shape = (Shape *) a->base; shape < limit; shape++) {
/* If the id is null, shape is already on the freelist. */
if (JSID_IS_VOID(shape->id))
continue;
if (shape->marked())
return false;
}
ap = &a->next;
}
return true;
}
void
js::PropertyTree::dumpShapes(JSContext *cx)
{
#ifdef DEBUG
JSRuntime *rt = compartment->rt;
if (const char *filename = rt->propTreeDumpFilename) {
if (const char *filename = cx->runtime->propTreeDumpFilename) {
char pathname[1024];
JS_snprintf(pathname, sizeof pathname, "%s.%lu",
filename, (unsigned long)rt->gcNumber);
filename, (unsigned long)cx->runtime->gcNumber);
FILE *dumpfp = fopen(pathname, "w");
if (dumpfp) {
typedef JSCompartment::EmptyShapeSet HS;
typedef JSRuntime::EmptyShapeSet HS;
HS &h = compartment->emptyShapes;
HS &h = cx->runtime->emptyShapes;
for (HS::Range r = h.all(); !r.empty(); r.popFront()) {
Shape *empty = r.front();
empty->dumpSubtree(cx, 0, dumpfp);
@ -666,5 +893,24 @@ js::PropertyTree::dumpShapes(JSContext *cx)
fclose(dumpfp);
}
}
#endif
#endif /* DEBUG */
}
void
js::PropertyTree::unmarkShapes(JSContext *cx)
{
JSArena **ap = &JS_PROPERTY_TREE(cx).arenaPool.first.next;
while (JSArena *a = *ap) {
Shape *limit = (Shape *) a->avail;
for (Shape *shape = (Shape *) a->base; shape < limit; shape++) {
/* If the id is null, shape is already on the freelist. */
if (JSID_IS_VOID(shape->id))
continue;
if (shape->marked())
shape->clearMark();
}
ap = &a->next;
}
}

55
js/src/jspropertytree.h
View File

@ -46,6 +46,19 @@
namespace js {
enum {
MAX_KIDS_PER_CHUNK = 10U,
CHUNK_HASH_THRESHOLD = 30U
};
struct KidsChunk {
js::Shape *kids[MAX_KIDS_PER_CHUNK];
KidsChunk *next;
static KidsChunk *create(JSContext *cx);
static KidsChunk *destroy(JSContext *cx, KidsChunk *chunk);
};
struct ShapeHasher {
typedef js::Shape *Key;
typedef const js::Shape *Lookup;
@ -60,8 +73,9 @@ class KidsPointer {
private:
enum {
SHAPE = 0,
HASH = 1,
TAG = 1
CHUNK = 1,
HASH = 2,
TAG = 3
};
jsuword w;
@ -70,6 +84,7 @@ class KidsPointer {
bool isNull() const { return !w; }
void setNull() { w = 0; }
bool isShapeOrNull() const { return (w & TAG) == SHAPE; }
bool isShape() const { return (w & TAG) == SHAPE && !isNull(); }
js::Shape *toShape() const {
JS_ASSERT(isShape());
@ -81,6 +96,17 @@ class KidsPointer {
w = reinterpret_cast<jsuword>(shape) | SHAPE;
}
bool isChunk() const { return (w & TAG) == CHUNK; }
KidsChunk *toChunk() const {
JS_ASSERT(isChunk());
return reinterpret_cast<KidsChunk *>(w & ~jsuword(TAG));
}
void setChunk(KidsChunk *chunk) {
JS_ASSERT(chunk);
JS_ASSERT((reinterpret_cast<jsuword>(chunk) & TAG) == 0);
w = reinterpret_cast<jsuword>(chunk) | CHUNK;
}
bool isHash() const { return (w & TAG) == HASH; }
KidsHash *toHash() const {
JS_ASSERT(isHash());
@ -101,35 +127,24 @@ class PropertyTree
{
friend struct ::JSFunction;
JSCompartment *compartment;
JSArenaPool arenaPool;
js::Shape *freeList;
JSArenaPool arenaPool;
js::Shape *freeList;
bool insertChild(JSContext *cx, js::Shape *parent, js::Shape *child);
void removeChild(js::Shape *child);
void removeChild(JSContext *cx, js::Shape *child);
PropertyTree();
public:
enum { MAX_HEIGHT = 64 };
PropertyTree(JSCompartment *comp)
: compartment(comp), freeList(NULL)
{
PodZero(&arenaPool);
}
bool init();
void finish();
js::Shape *newShapeUnchecked();
js::Shape *newShape(JSContext *cx);
js::Shape *newShape(JSContext *cx, bool gcLocked = false);
js::Shape *getChild(JSContext *cx, js::Shape *parent, const js::Shape &child);
void orphanChildren(js::Shape *shape);
void sweepShapes(JSContext *cx);
bool checkShapesAllUnmarked(JSContext *cx);
void dumpShapes(JSContext *cx);
static void orphanKids(JSContext *cx, js::Shape *shape);
static void sweepShapes(JSContext *cx);
static void unmarkShapes(JSContext *cx);
#ifdef DEBUG
static void meter(JSBasicStats *bs, js::Shape *node);
#endif

77
js/src/jsscope.cpp
View File

@ -71,10 +71,12 @@ using namespace js;
using namespace js::gc;
uint32
js_GenerateShape(JSRuntime *rt)
js_GenerateShape(JSContext *cx, bool gcLocked)
{
JSRuntime *rt;
uint32 shape;
rt = cx->runtime;
shape = JS_ATOMIC_INCREMENT(&rt->shapeGen);
JS_ASSERT(shape != 0);
if (shape >= SHAPE_OVERFLOW_BIT) {
@ -88,19 +90,13 @@ js_GenerateShape(JSRuntime *rt)
shape = SHAPE_OVERFLOW_BIT;
#ifdef JS_THREADSAFE
AutoLockGC lockIf(rt);
Conditionally<AutoLockGC> lockIf(!gcLocked, rt);
#endif
TriggerGC(rt);
}
return shape;
}
uint32
js_GenerateShape(JSContext *cx)
{
return js_GenerateShape(cx->runtime);
}
bool
JSObject::ensureClassReservedSlotsForEmptyObject(JSContext *cx)
{
@ -202,10 +198,11 @@ Shape::hashify(JSRuntime *rt)
#endif
static inline bool
InitField(JSCompartment *comp, EmptyShape *JSCompartment:: *field, Class *clasp)
InitField(JSContext *cx, EmptyShape *JSRuntime:: *field, Class *clasp, uint32 shape)
{
if (EmptyShape *emptyShape = EmptyShape::create(comp, clasp)) {
comp->*field = emptyShape;
if (EmptyShape *emptyShape = EmptyShape::create(cx, clasp)) {
cx->runtime->*field = emptyShape;
JS_ASSERT(emptyShape->shape == shape);
return true;
}
return false;
@ -213,7 +210,7 @@ InitField(JSCompartment *comp, EmptyShape *JSCompartment:: *field, Class *clasp)
/* static */
bool
Shape::initEmptyShapes(JSCompartment *comp)
Shape::initRuntimeState(JSContext *cx)
{
/*
* NewArguments allocates dslots to have enough room for the argc of the
@ -225,10 +222,12 @@ Shape::initEmptyShapes(JSCompartment *comp)
* arguments objects. This helps ensure that any arguments object needing
* its own mutable scope (with unique shape) is a rare event.
*/
if (!InitField(comp, &JSCompartment::emptyArgumentsShape, &js_ArgumentsClass))
if (!InitField(cx, &JSRuntime::emptyArgumentsShape, &js_ArgumentsClass,
Shape::EMPTY_ARGUMENTS_SHAPE)) {
return false;
}
if (!InitField(comp, &JSCompartment::emptyBlockShape, &js_BlockClass))
if (!InitField(cx, &JSRuntime::emptyBlockShape, &js_BlockClass, Shape::EMPTY_BLOCK_SHAPE))
return false;
/*
@ -236,19 +235,23 @@ Shape::initEmptyShapes(JSCompartment *comp)
* and vars do not force the creation of a mutable scope for the particular
* call object being accessed.
*/
if (!InitField(comp, &JSCompartment::emptyCallShape, &js_CallClass))
if (!InitField(cx, &JSRuntime::emptyCallShape, &js_CallClass, Shape::EMPTY_CALL_SHAPE))
return false;
/* A DeclEnv object holds the name binding for a named function expression. */
if (!InitField(comp, &JSCompartment::emptyDeclEnvShape, &js_DeclEnvClass))
if (!InitField(cx, &JSRuntime::emptyDeclEnvShape, &js_DeclEnvClass,
Shape::EMPTY_DECL_ENV_SHAPE)) {
return false;
}
/* Non-escaping native enumerator objects share this empty scope. */
if (!InitField(comp, &JSCompartment::emptyEnumeratorShape, &js_IteratorClass))
if (!InitField(cx, &JSRuntime::emptyEnumeratorShape, &js_IteratorClass,
Shape::EMPTY_ENUMERATOR_SHAPE)) {
return false;
}
/* Same drill for With objects. */
if (!InitField(comp, &JSCompartment::emptyWithShape, &js_WithClass))
if (!InitField(cx, &JSRuntime::emptyWithShape, &js_WithClass, Shape::EMPTY_WITH_SHAPE))
return false;
return true;
@ -256,14 +259,16 @@ Shape::initEmptyShapes(JSCompartment *comp)
/* static */
void
Shape::finishEmptyShapes(JSCompartment *comp)
Shape::finishRuntimeState(JSContext *cx)
{
comp->emptyArgumentsShape = NULL;
comp->emptyBlockShape = NULL;
comp->emptyCallShape = NULL;
comp->emptyDeclEnvShape = NULL;
comp->emptyEnumeratorShape = NULL;
comp->emptyWithShape = NULL;
JSRuntime *rt = cx->runtime;
rt->emptyArgumentsShape = NULL;
rt->emptyBlockShape = NULL;
rt->emptyCallShape = NULL;
rt->emptyDeclEnvShape = NULL;
rt->emptyEnumeratorShape = NULL;
rt->emptyWithShape = NULL;
}
JS_STATIC_ASSERT(sizeof(JSHashNumber) == 4);
@ -586,12 +591,12 @@ Shape::newDictionaryShape(JSContext *cx, const Shape &child, Shape **listp)
new (dprop) Shape(child.id, child.rawGetter, child.rawSetter, child.slot, child.attrs,
(child.flags & ~FROZEN) | IN_DICTIONARY, child.shortid,
js_GenerateShape(cx), child.slotSpan);
js_GenerateShape(cx, false), child.slotSpan);
dprop->listp = NULL;
dprop->insertIntoDictionary(listp);
JS_COMPARTMENT_METER(cx->compartment->liveDictModeNodes++);
JS_RUNTIME_METER(cx->runtime, liveDictModeNodes);
return dprop;
}
@ -608,7 +613,7 @@ Shape::newDictionaryShapeForAddProperty(JSContext *cx, jsid id,
shape->parent = NULL;
shape->listp = NULL;
JS_COMPARTMENT_METER(cx->compartment->liveDictModeNodes++);
JS_RUNTIME_METER(cx->runtime, liveDictModeNodes);
return shape;
}
@ -753,6 +758,12 @@ JSObject::checkShapeConsistency()
}
prev = shape;
}
if (throttle == 0) {
JS_ASSERT(!shape->table);
JS_ASSERT(JSID_IS_EMPTY(shape->id));
JS_ASSERT(shape->slot == SHAPE_INVALID_SLOT);
}
}
}
#else
@ -842,6 +853,7 @@ JSObject::addPropertyInternal(JSContext *cx, jsid id,
}
#ifdef DEBUG
LIVE_SCOPE_METER(cx, ++cx->runtime->liveObjectProps);
JS_RUNTIME_METER(cx->runtime, totalObjectProps);
#endif
CHECK_SHAPE_CONSISTENCY(this);
METER(adds);
@ -978,7 +990,7 @@ JSObject::putProperty(JSContext *cx, jsid id,
* we regenerate only lastProp->shape. We will clearOwnShape(), which
* sets objShape to lastProp->shape.
*/
lastProp->shape = js_GenerateShape(cx);
lastProp->shape = js_GenerateShape(cx, false);
clearOwnShape();
} else {
/*
@ -1089,7 +1101,7 @@ JSObject::changeProperty(JSContext *cx, const Shape *shape, uintN attrs, uintN m
updateFlags(shape);
/* See the corresponding code in putProperty. */
lastProp->shape = js_GenerateShape(cx);
lastProp->shape = js_GenerateShape(cx, false);
clearOwnShape();
if (!js_UpdateWatchpointsForShape(cx, this, shape)) {
@ -1328,7 +1340,7 @@ JSObject::generateOwnShape(JSContext *cx)
tr->forgetGuardedShapesForObject(this);
#endif
setOwnShape(js_GenerateShape(cx));
setOwnShape(js_GenerateShape(cx, false));
}
void
@ -1467,9 +1479,6 @@ PrintPropertyMethod(JSTracer *trc, char *buf, size_t bufsize)
void
Shape::trace(JSTracer *trc) const
{
JSRuntime *rt = trc->context->runtime;
JS_ASSERT_IF(rt->gcCurrentCompartment, compartment == rt->gcCurrentCompartment);
if (IS_GC_MARKING_TRACER(trc))
mark();

39
js/src/jsscope.h
View File

@ -305,15 +305,21 @@ struct Shape : public JSObjectMap
public:
inline void freeTable(JSContext *cx);
static bool initEmptyShapes(JSCompartment *comp);
static void finishEmptyShapes(JSCompartment *comp);
static bool initRuntimeState(JSContext *cx);
static void finishRuntimeState(JSContext *cx);
enum {
EMPTY_ARGUMENTS_SHAPE = 1,
EMPTY_BLOCK_SHAPE = 2,
EMPTY_CALL_SHAPE = 3,
EMPTY_DECL_ENV_SHAPE = 4,
EMPTY_ENUMERATOR_SHAPE = 5,
EMPTY_WITH_SHAPE = 6,
LAST_RESERVED_SHAPE = 6
};
jsid id;
#ifdef DEBUG
JSCompartment *compartment;
#endif
protected:
union {
js::PropertyOp rawGetter; /* getter and setter hooks or objects */
@ -503,7 +509,7 @@ struct Shape : public JSObjectMap
uintN flags, intN shortid, uint32 shape = INVALID_SHAPE, uint32 slotSpan = 0);
/* Used by EmptyShape (see jsscopeinlines.h). */
Shape(JSCompartment *comp, Class *aclasp);
Shape(JSContext *cx, Class *aclasp);
bool marked() const { return (flags & MARK) != 0; }
void mark() const { flags |= MARK; }
@ -631,22 +637,15 @@ struct Shape : public JSObjectMap
struct EmptyShape : public js::Shape
{
EmptyShape(JSCompartment *comp, js::Class *aclasp);
EmptyShape(JSContext *cx, js::Class *aclasp);
js::Class *getClass() const { return clasp; };
static EmptyShape *create(JSCompartment *comp, js::Class *clasp) {
js::Shape *eprop = comp->propertyTree.newShapeUnchecked();
if (!eprop)
return NULL;
return new (eprop) EmptyShape(comp, clasp);
}
static EmptyShape *create(JSContext *cx, js::Class *clasp) {
js::Shape *eprop = JS_PROPERTY_TREE(cx).newShape(cx);
if (!eprop)
return NULL;
return new (eprop) EmptyShape(cx->compartment, clasp);
return new (eprop) EmptyShape(cx, clasp);
}
};
@ -737,7 +736,6 @@ JSObject::setLastProperty(const js::Shape *shape)
JS_ASSERT(!inDictionaryMode());
JS_ASSERT(!JSID_IS_VOID(shape->id));
JS_ASSERT_IF(lastProp, !JSID_IS_VOID(lastProp->id));
JS_ASSERT(shape->compartment == compartment());
lastProp = const_cast<js::Shape *>(shape);
}
@ -806,11 +804,12 @@ Shape::insertIntoDictionary(js::Shape **dictp)
((shape)->hasShortID() ? INT_TO_JSID((shape)->shortid) \
: (shape)->id)
extern uint32
js_GenerateShape(JSRuntime *rt);
#ifndef JS_THREADSAFE
# define js_GenerateShape(cx, gcLocked) js_GenerateShape (cx)
#endif
extern uint32
js_GenerateShape(JSContext *cx);
js_GenerateShape(JSContext *cx, bool gcLocked);
#ifdef DEBUG
struct JSScopeStats {

30
js/src/jsscopeinlines.h
View File

@ -107,7 +107,7 @@ JSObject::updateShape(JSContext *cx)
JS_ASSERT(isNative());
js::LeaveTraceIfGlobalObject(cx, this);
if (hasOwnShape())
setOwnShape(js_GenerateShape(cx));
setOwnShape(js_GenerateShape(cx, false));
else
objShape = lastProp->shape;
}
@ -146,13 +146,13 @@ JSObject::trace(JSTracer *trc)
* it must have the same shape as lastProp.
*/
if (!shape->hasRegenFlag()) {
shape->shape = js_RegenerateShapeForGC(cx->runtime);
shape->shape = js_RegenerateShapeForGC(cx);
shape->setRegenFlag();
}
uint32 newShape = shape->shape;
if (hasOwnShape()) {
newShape = js_RegenerateShapeForGC(cx->runtime);
newShape = js_RegenerateShapeForGC(cx);
JS_ASSERT(newShape != shape->shape);
}
objShape = newShape;
@ -180,18 +180,10 @@ Shape::Shape(jsid id, js::PropertyOp getter, js::PropertyOp setter, uint32 slot,
}
inline
Shape::Shape(JSCompartment *comp, Class *aclasp)
: JSObjectMap(js_GenerateShape(comp->rt), JSSLOT_FREE(aclasp)),
numSearches(0),
table(NULL),
id(JSID_EMPTY),
clasp(aclasp),
rawSetter(NULL),
slot(SHAPE_INVALID_SLOT),
attrs(0),
flags(SHARED_EMPTY),
shortid(0),
parent(NULL)
Shape::Shape(JSContext *cx, Class *aclasp)
: JSObjectMap(js_GenerateShape(cx, false), JSSLOT_FREE(aclasp)), numSearches(0), table(NULL),
id(JSID_EMPTY), clasp(aclasp), rawSetter(NULL), slot(SHAPE_INVALID_SLOT), attrs(0),
flags(SHARED_EMPTY), shortid(0), parent(NULL)
{
kids.setNull();
}
@ -284,12 +276,12 @@ Shape::set(JSContext* cx, JSObject* obj, js::Value* vp) const
}
inline
EmptyShape::EmptyShape(JSCompartment *comp, js::Class *aclasp)
: js::Shape(comp, aclasp)
EmptyShape::EmptyShape(JSContext *cx, js::Class *aclasp)
: js::Shape(cx, aclasp)
{
#ifdef DEBUG
if (comp->rt->meterEmptyShapes())
comp->emptyShapes.put(this);
if (cx->runtime->meterEmptyShapes())
cx->runtime->emptyShapes.put(this);
#endif
}

6
js/src/jsscriptinlines.h
View File

@ -52,14 +52,14 @@ namespace js {
inline
Bindings::Bindings(JSContext *cx)
: lastBinding(cx->compartment->emptyCallShape), nargs(0), nvars(0), nupvars(0)
: lastBinding(cx->runtime->emptyCallShape), nargs(0), nvars(0), nupvars(0)
{
}
inline void
Bindings::transfer(JSContext *cx, Bindings *bindings)
{
JS_ASSERT(lastBinding == cx->compartment->emptyCallShape);
JS_ASSERT(lastBinding == cx->runtime->emptyCallShape);
*this = *bindings;
#ifdef DEBUG
@ -74,7 +74,7 @@ Bindings::transfer(JSContext *cx, Bindings *bindings)
inline void
Bindings::clone(JSContext *cx, Bindings *bindings)
{
JS_ASSERT(lastBinding == cx->compartment->emptyCallShape);
JS_ASSERT(lastBinding == cx->runtime->emptyCallShape);
/*
* Non-dictionary bindings are fine to share, as are dictionary bindings if