mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1142717, part 5 - Eliminate XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK. r=bholley 

This has been 1 since the what looks like the initial landing in 2001, so clearly we don't need this generality.
This commit is contained in:
Andrew McCreight 2015-03-18 11:36:04 -07:00
Родитель 4b0504854b
Коммит 63b1441eef
3 изменённых файлов: 62 добавлений и 88 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
js/xpconnect/src/XPCInlines.h
Просмотреть файл

@ -539,19 +539,17 @@ XPCWrappedNative::SweepTearOffs()
{
XPCWrappedNativeTearOffChunk* chunk;
for (chunk = &mFirstChunk; chunk; chunk = chunk->mNextChunk) {
XPCWrappedNativeTearOff* to = chunk->mTearOffs;
for (int i = XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK; i > 0; i--, to++) {
bool marked = to->IsMarked();
to->Unmark();
if (marked)
continue;
XPCWrappedNativeTearOff* to = &chunk->mTearOff;
bool marked = to->IsMarked();
to->Unmark();
if (marked)
continue;
// If this tearoff does not have a live dedicated JSObject,
// then let's recycle it.
if (!to->GetJSObjectPreserveColor()) {
to->SetNative(nullptr);
to->SetInterface(nullptr);
}
// If this tearoff does not have a live dedicated JSObject,
// then let's recycle it.
if (!to->GetJSObjectPreserveColor()) {
to->SetNative(nullptr);
to->SetInterface(nullptr);
}
}
}

118
js/xpconnect/src/XPCWrappedNative.cpp
Просмотреть файл

@ -103,13 +103,11 @@ XPCWrappedNative::NoteTearoffs(nsCycleCollectionTraversalCallback& cb)
// record an edge here.
XPCWrappedNativeTearOffChunk* chunk;
for (chunk = &mFirstChunk; chunk; chunk = chunk->mNextChunk) {
XPCWrappedNativeTearOff* to = chunk->mTearOffs;
for (int i = XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK-1; i >= 0; i--, to++) {
JSObject* jso = to->GetJSObjectPreserveColor();
if (!jso) {
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "tearoff's mNative");
cb.NoteXPCOMChild(to->GetNative());
}
XPCWrappedNativeTearOff* to = &chunk->mTearOff;
JSObject* jso = to->GetJSObjectPreserveColor();
if (!jso) {
NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "tearoff's mNative");
cb.NoteXPCOMChild(to->GetNative());
}
}
}
@ -893,26 +891,24 @@ XPCWrappedNative::FlatJSObjectFinalized()
XPCWrappedNativeTearOffChunk* chunk;
for (chunk = &mFirstChunk; chunk; chunk = chunk->mNextChunk) {
XPCWrappedNativeTearOff* to = chunk->mTearOffs;
for (int i = XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK-1; i >= 0; i--, to++) {
JSObject* jso = to->GetJSObjectPreserveColor();
if (jso) {
JS_SetPrivate(jso, nullptr);
XPCWrappedNativeTearOff* to = &chunk->mTearOff;
JSObject* jso = to->GetJSObjectPreserveColor();
if (jso) {
JS_SetPrivate(jso, nullptr);
#ifdef DEBUG
JS_UpdateWeakPointerAfterGCUnbarriered(&jso);
MOZ_ASSERT(!jso);
JS_UpdateWeakPointerAfterGCUnbarriered(&jso);
MOZ_ASSERT(!jso);
#endif
to->JSObjectFinalized();
}
// We also need to release any native pointers held...
nsRefPtr<nsISupports> native = to->TakeNative();
if (native && GetRuntime()) {
DeferredFinalize(native.forget().take());
}
to->SetInterface(nullptr);
to->JSObjectFinalized();
}
// We also need to release any native pointers held...
nsRefPtr<nsISupports> native = to->TakeNative();
if (native && GetRuntime()) {
DeferredFinalize(native.forget().take());
}
to->SetInterface(nullptr);
}
nsWrapperCache *cache = nullptr;
@ -986,17 +982,15 @@ XPCWrappedNative::SystemIsBeingShutDown()
XPCWrappedNativeTearOffChunk* chunk;
for (chunk = &mFirstChunk; chunk; chunk = chunk->mNextChunk) {
XPCWrappedNativeTearOff* to = chunk->mTearOffs;
for (int i = XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK-1; i >= 0; i--, to++) {
if (JSObject *jso = to->GetJSObjectPreserveColor()) {
JS_SetPrivate(jso, nullptr);
to->SetJSObject(nullptr);
}
// We leak the tearoff mNative
// (for the same reason we leak mIdentity - see above).
unused << to->TakeNative().take();
to->SetInterface(nullptr);
XPCWrappedNativeTearOff* to = &chunk->mTearOff;
if (JSObject *jso = to->GetJSObjectPreserveColor()) {
JS_SetPrivate(jso, nullptr);
to->SetJSObject(nullptr);
}
// We leak the tearoff mNative
// (for the same reason we leak mIdentity - see above).
unused << to->TakeNative().take();
to->SetInterface(nullptr);
}
if (mFirstChunk.mNextChunk) {
@ -1051,15 +1045,9 @@ XPCWrappedNative::LocateTearOff(XPCNativeInterface* aInterface)
for (XPCWrappedNativeTearOffChunk* chunk = &mFirstChunk;
chunk != nullptr;
chunk = chunk->mNextChunk) {
XPCWrappedNativeTearOff* tearOff = chunk->mTearOffs;
XPCWrappedNativeTearOff* const end = tearOff +
XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK;
for (tearOff = chunk->mTearOffs;
tearOff < end;
tearOff++) {
if (tearOff->GetInterface() == aInterface) {
return tearOff;
}
XPCWrappedNativeTearOff* tearOff = &chunk->mTearOff;
if (tearOff->GetInterface() == aInterface) {
return tearOff;
}
}
return nullptr;
@ -1080,33 +1068,27 @@ XPCWrappedNative::FindTearOff(XPCNativeInterface* aInterface,
for (lastChunk = chunk = &mFirstChunk;
chunk;
lastChunk = chunk, chunk = chunk->mNextChunk) {
to = chunk->mTearOffs;
XPCWrappedNativeTearOff* const end = chunk->mTearOffs +
XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK;
for (to = chunk->mTearOffs;
to < end;
to++) {
if (to->GetInterface() == aInterface) {
if (needJSObject && !to->GetJSObjectPreserveColor()) {
AutoMarkingWrappedNativeTearOffPtr tearoff(cx, to);
bool ok = InitTearOffJSObject(to);
// During shutdown, we don't sweep tearoffs. So make sure
// to unmark manually in case the auto-marker marked us.
// We shouldn't ever be getting here _during_ our
// Mark/Sweep cycle, so this should be safe.
to->Unmark();
if (!ok) {
to = nullptr;
rv = NS_ERROR_OUT_OF_MEMORY;
}
to = &chunk->mTearOff;
if (to->GetInterface() == aInterface) {
if (needJSObject && !to->GetJSObjectPreserveColor()) {
AutoMarkingWrappedNativeTearOffPtr tearoff(cx, to);
bool ok = InitTearOffJSObject(to);
// During shutdown, we don't sweep tearoffs. So make sure
// to unmark manually in case the auto-marker marked us.
// We shouldn't ever be getting here _during_ our
// Mark/Sweep cycle, so this should be safe.
to->Unmark();
if (!ok) {
to = nullptr;
rv = NS_ERROR_OUT_OF_MEMORY;
}
if (pError)
*pError = rv;
return to;
}
if (!firstAvailable && to->IsAvailable())
firstAvailable = to;
if (pError)
*pError = rv;
return to;
}
if (!firstAvailable && to->IsAvailable())
firstAvailable = to;
}
to = firstAvailable;
@ -1114,7 +1096,7 @@ XPCWrappedNative::FindTearOff(XPCNativeInterface* aInterface,
if (!to) {
auto newChunk = new XPCWrappedNativeTearOffChunk();
lastChunk->mNextChunk = newChunk;
to = newChunk->mTearOffs;
to = &newChunk->mTearOff;
}
{

10
js/xpconnect/src/xpcprivate.h
Просмотреть файл

@ -1988,16 +1988,10 @@ private:
};
/***********************************************/
// XPCWrappedNativeTearOffChunk is a collections of XPCWrappedNativeTearOff
// XPCWrappedNativeTearOffChunk is a linked list of XPCWrappedNativeTearOff
// objects. It lets us allocate a set of XPCWrappedNativeTearOff objects and
// link the sets - rather than only having the option of linking single
// XPCWrappedNativeTearOff objects.
//
// The value of XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK can be tuned at buildtime
// to balance between the code of allocations of additional chunks and the waste
// of space for ununsed XPCWrappedNativeTearOff objects.
#define XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK 1
class XPCWrappedNativeTearOffChunk
{
@ -2007,7 +2001,7 @@ private:
~XPCWrappedNativeTearOffChunk() {delete mNextChunk;}
private:
XPCWrappedNativeTearOff mTearOffs[XPC_WRAPPED_NATIVE_TEAROFFS_PER_CHUNK];
XPCWrappedNativeTearOff mTearOff;
XPCWrappedNativeTearOffChunk* mNextChunk;
};