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

Fix for bug 484821 (Have a separate hash for main-thread only XPCWrappedNativeProto). r/sr=mrbkap.

This commit is contained in:
Peter Van der Beken 2009-03-24 11:14:43 +01:00
Родитель 517988bd1b
Коммит 04b518500d
4 изменённых файлов: 37 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1785,7 +1785,8 @@ nsXPConnect::RestoreWrappedNativePrototype(JSContext * aJSContext,
if(si && si->GetFlags().DontSharePrototype())
return UnexpectedFailure(NS_ERROR_INVALID_ARG);
ClassInfo2WrappedNativeProtoMap* map = scope->GetWrappedNativeProtoMap();
ClassInfo2WrappedNativeProtoMap* map =
scope->GetWrappedNativeProtoMap(proto->ClassIsMainThreadOnly());
XPCLock* lock = GetRuntime()->GetMapLock();
{ // scoped lock

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

@ -1234,7 +1234,10 @@ public:
GetWrapperMap() const {return mWrapperMap;}
ClassInfo2WrappedNativeProtoMap*
GetWrappedNativeProtoMap() const {return mWrappedNativeProtoMap;}
GetWrappedNativeProtoMap(JSBool aMainThreadOnly) const
{return aMainThreadOnly ?
mMainThreadWrappedNativeProtoMap :
mWrappedNativeProtoMap;}
nsXPCComponents*
GetComponents() const {return mComponents;}
@ -1340,6 +1343,7 @@ private:
XPCJSRuntime* mRuntime;
Native2WrappedNativeMap* mWrappedNativeMap;
ClassInfo2WrappedNativeProtoMap* mWrappedNativeProtoMap;
ClassInfo2WrappedNativeProtoMap* mMainThreadWrappedNativeProtoMap;
WrappedNative2WrapperMap* mWrapperMap;
nsXPCComponents* mComponents;
XPCWrappedNativeScope* mNext;

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

@ -167,7 +167,7 @@ XPCWrappedNativeProto::JSProtoObjectFinalized(JSContext *cx, JSObject *obj)
{
// Only remove this proto from the map if it is the one in the map.
ClassInfo2WrappedNativeProtoMap* map =
GetScope()->GetWrappedNativeProtoMap();
GetScope()->GetWrappedNativeProtoMap(ClassIsMainThreadOnly());
if(map->Find(mClassInfo) == this)
map->Remove(mClassInfo);
}
@ -244,8 +244,9 @@ XPCWrappedNativeProto::GetNewOrUsed(XPCCallContext& ccx,
if(shared)
{
map = Scope->GetWrappedNativeProtoMap();
lock = Scope->GetRuntime()->GetMapLock();
JSBool mainThreadOnly = !!(ciFlags & nsIClassInfo::MAIN_THREAD_ONLY);
map = Scope->GetWrappedNativeProtoMap(mainThreadOnly);
lock = mainThreadOnly ? nsnull : Scope->GetRuntime()->GetMapLock();
{ // scoped lock
XPCAutoLock al(lock);
proto = map->Find(ClassInfo);

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

@ -138,6 +138,7 @@ XPCWrappedNativeScope::XPCWrappedNativeScope(XPCCallContext& ccx,
: mRuntime(ccx.GetRuntime()),
mWrappedNativeMap(Native2WrappedNativeMap::newMap(XPC_NATIVE_MAP_SIZE)),
mWrappedNativeProtoMap(ClassInfo2WrappedNativeProtoMap::newMap(XPC_NATIVE_PROTO_MAP_SIZE)),
mMainThreadWrappedNativeProtoMap(ClassInfo2WrappedNativeProtoMap::newMap(XPC_NATIVE_PROTO_MAP_SIZE)),
mWrapperMap(WrappedNative2WrapperMap::newMap(XPC_WRAPPER_MAP_SIZE)),
mComponents(nsnull),
mNext(nsnull),
@ -319,6 +320,12 @@ XPCWrappedNativeScope::~XPCWrappedNativeScope()
delete mWrappedNativeProtoMap;
}
if(mMainThreadWrappedNativeProtoMap)
{
NS_ASSERTION(0 == mMainThreadWrappedNativeProtoMap->Count(), "scope has non-empty map");
delete mMainThreadWrappedNativeProtoMap;
}
if(mWrapperMap)
{
NS_ASSERTION(0 == mWrapperMap->Count(), "scope has non-empty map");
@ -532,6 +539,7 @@ XPCWrappedNativeScope::MarkAllWrappedNativesAndProtos()
{
cur->mWrappedNativeMap->Enumerate(WrappedNativeMarker, nsnull);
cur->mWrappedNativeProtoMap->Enumerate(WrappedNativeProtoMarker, nsnull);
cur->mMainThreadWrappedNativeProtoMap->Enumerate(WrappedNativeProtoMarker, nsnull);
}
DEBUG_TrackScopeTraversal();
@ -564,6 +572,8 @@ XPCWrappedNativeScope::ASSERT_NoInterfaceSetsAreMarked()
ASSERT_WrappedNativeSetNotMarked, nsnull);
cur->mWrappedNativeProtoMap->Enumerate(
ASSERT_WrappedNativeProtoSetNotMarked, nsnull);
cur->mMainThreadWrappedNativeProtoMap->Enumerate(
ASSERT_WrappedNativeProtoSetNotMarked, nsnull);
}
}
#endif
@ -678,6 +688,8 @@ XPCWrappedNativeScope::SystemIsBeingShutDown(JSContext* cx)
// proto pointers in the proto map.
cur->mWrappedNativeProtoMap->
Enumerate(WrappedNativeProtoShutdownEnumerator, &data);
cur->mMainThreadWrappedNativeProtoMap->
Enumerate(WrappedNativeProtoShutdownEnumerator, &data);
cur->mWrappedNativeMap->
Enumerate(WrappedNativeShutdownEnumerator, &data);
}
@ -867,6 +879,7 @@ XPCWrappedNativeScope::ClearAllWrappedNativeSecurityPolicies(XPCCallContext& ccx
for(XPCWrappedNativeScope* cur = gScopes; cur; cur = cur->mNext)
{
cur->mWrappedNativeProtoMap->Enumerate(WNProtoSecPolicyClearer, nsnull);
cur->mMainThreadWrappedNativeProtoMap->Enumerate(WNProtoSecPolicyClearer, nsnull);
cur->mWrappedNativeMap->Enumerate(WNSecPolicyClearer, nsnull);
}
@ -896,6 +909,8 @@ XPCWrappedNativeScope::RemoveWrappedNativeProtos()
mWrappedNativeProtoMap->Enumerate(WNProtoRemover,
GetRuntime()->GetDetachedWrappedNativeProtoMap());
mMainThreadWrappedNativeProtoMap->Enumerate(WNProtoRemover,
GetRuntime()->GetDetachedWrappedNativeProtoMap());
}
/***************************************************************************/
@ -976,6 +991,17 @@ XPCWrappedNativeScope::DebugDump(PRInt16 depth)
mWrappedNativeProtoMap->Enumerate(WrappedNativeProtoMapDumpEnumerator, &depth);
XPC_LOG_OUTDENT();
}
XPC_LOG_ALWAYS(("mMainThreadWrappedNativeProtoMap @ %x with %d protos(s)", \
mMainThreadWrappedNativeProtoMap, \
mMainThreadWrappedNativeProtoMap ? mMainThreadWrappedNativeProtoMap->Count() : 0));
// iterate contexts...
if(depth && mMainThreadWrappedNativeProtoMap && mMainThreadWrappedNativeProtoMap->Count())
{
XPC_LOG_INDENT();
mMainThreadWrappedNativeProtoMap->Enumerate(WrappedNativeProtoMapDumpEnumerator, &depth);
XPC_LOG_OUTDENT();
}
XPC_LOG_OUTDENT();
#endif
}