corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1165054 - Add API to clear postbarrier callbacks and use it when CPOW tables are destroyed r=terrence

Browse Source
This commit is contained in:
Jon Coppeard
2015-07-15 10:22:04 +01:00
parent 81878d5e0b
commit 71d6ba4fdc
7 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
js/ipc/JavaScriptShared.cpp
View File

@@ -85,33 +85,26 @@ IdToObjectMap::empty() const
return table_.empty();
}
ObjectToIdMap::ObjectToIdMap()
: table_(nullptr)
ObjectToIdMap::ObjectToIdMap(JSRuntime* rt)
: rt_(rt)
{
}
ObjectToIdMap::~ObjectToIdMap()
{
if (table_) {
dom::AddForDeferredFinalization<Table>(table_);
table_ = nullptr;
}
JS_ClearAllPostBarrierCallbacks(rt_);
}
bool
ObjectToIdMap::init()
{
if (table_)
return true;
table_ = new Table(SystemAllocPolicy());
return table_ && table_->init(32);
return table_.initialized() || table_.init(32);
}
void
ObjectToIdMap::trace(JSTracer* trc)
{
for (Table::Enum e(*table_); !e.empty(); e.popFront()) {
for (Table::Enum e(table_); !e.empty(); e.popFront()) {
JSObject* obj = e.front().key();
JS_CallUnbarrieredObjectTracer(trc, &obj, "ipc-object");
if (obj != e.front().key())
@@ -122,7 +115,7 @@ ObjectToIdMap::trace(JSTracer* trc)
void
ObjectToIdMap::sweep()
{
for (Table::Enum e(*table_); !e.empty(); e.popFront()) {
for (Table::Enum e(table_); !e.empty(); e.popFront()) {
JSObject* obj = e.front().key();
JS_UpdateWeakPointerAfterGCUnbarriered(&obj);
if (!obj)
@@ -135,7 +128,7 @@ ObjectToIdMap::sweep()
ObjectId
ObjectToIdMap::find(JSObject* obj)
{
Table::Ptr p = table_->lookup(obj);
Table::Ptr p = table_.lookup(obj);
if (!p)
return ObjectId::nullId();
return p->value();
@@ -144,9 +137,9 @@ ObjectToIdMap::find(JSObject* obj)
bool
ObjectToIdMap::add(JSContext* cx, JSObject* obj, ObjectId id)
{
if (!table_->put(obj, id))
if (!table_.put(obj, id))
return false;
JS_StoreObjectPostBarrierCallback(cx, keyMarkCallback, obj, table_);
JS_StoreObjectPostBarrierCallback(cx, keyMarkCallback, obj, &table_);
return true;
}
@@ -166,13 +159,13 @@ ObjectToIdMap::keyMarkCallback(JSTracer* trc, JSObject* key, void* data)
void
ObjectToIdMap::remove(JSObject* obj)
{
table_->remove(obj);
table_.remove(obj);
}
void
ObjectToIdMap::clear()
{
table_->clear();
table_.clear();
}
bool JavaScriptShared::sLoggingInitialized;
@@ -182,7 +175,9 @@ bool JavaScriptShared::sStackLoggingEnabled;
JavaScriptShared::JavaScriptShared(JSRuntime* rt)
: rt_(rt),
refcount_(1),
nextSerialNumber_(1)
nextSerialNumber_(1),
unwaivedObjectIds_(rt),
waivedObjectIds_(rt)
{
if (!sLoggingInitialized) {
sLoggingInitialized = true;