зеркало из https://github.com/mozilla/pjs.git
fixes bug 337492 "xpcom proxies may release proxied object on random threads" r=bsmedberg
This commit is contained in:
darin%meer.net
Родитель
26d75c37df
Коммит
9fe4f30c36
|
|
@ -52,6 +52,7 @@
|
|||
|
||||
#include "nsProxyEvent.h"
|
||||
#include "nsProxyEventPrivate.h"
|
||||
#include "nsProxyRelease.h"
|
||||
#include "nsIProxyObjectManager.h"
|
||||
#include "nsCRT.h"
|
||||
|
||||
|
|
@ -409,20 +410,22 @@ nsProxyObjectCallInfo::SetCallersTarget(nsIEventTarget* target)
|
|||
}
|
||||
|
||||
nsProxyObject::nsProxyObject(nsIEventTarget *target, PRInt32 proxyType,
|
||||
nsISupports *realObject)
|
||||
nsISupports *realObject,
|
||||
nsISupports *rootObject)
|
||||
{
|
||||
mRealObject = realObject;
|
||||
mRootObject = rootObject;
|
||||
mTarget = target;
|
||||
mProxyType = proxyType;
|
||||
}
|
||||
|
||||
nsProxyObject::~nsProxyObject()
|
||||
{
|
||||
// I am worried about order of destruction here.
|
||||
// do not remove assignments.
|
||||
|
||||
mRealObject = 0;
|
||||
mTarget = 0;
|
||||
// Proxy the release of mRealObject to protect against it being deleted on
|
||||
// the wrong thread.
|
||||
nsISupports *doomed = nsnull;
|
||||
mRealObject.swap(doomed);
|
||||
NS_ProxyRelease(mTarget, doomed);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -1,171 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef nsProxyEvent_h__
|
||||
#define nsProxyEvent_h__
|
||||
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nscore.h"
|
||||
#include "nsISupports.h"
|
||||
#include "nsIFactory.h"
|
||||
#include "nsIEventTarget.h"
|
||||
|
||||
#include "prtypes.h"
|
||||
#include "xptcall.h"
|
||||
#include "xptinfo.h"
|
||||
|
||||
class nsProxyObjectCallInfo;
|
||||
class nsIRunnable;
|
||||
|
||||
//#define AUTOPROXIFICATION
|
||||
|
||||
// WARNING about NS_PROXY_ASYNC:
|
||||
//
|
||||
// If the calling thread goes away, any function which accesses the calling stack
|
||||
// will blow up.
|
||||
//
|
||||
// example:
|
||||
//
|
||||
// myFoo->bar(&x)
|
||||
//
|
||||
// ... thread goes away ...
|
||||
//
|
||||
// bar(PRInt32 *x)
|
||||
// {
|
||||
// *x = 0; <----- You will blow up here.
|
||||
//
|
||||
//
|
||||
// So what gets saved?
|
||||
//
|
||||
// You can safely pass base types by value. You can also pass interface pointers.
|
||||
// I will make sure that the interface pointers are addrefed while they are being
|
||||
// proxied. You can also pass string and wstring. These I will copy and free.
|
||||
//
|
||||
// I do **NOT** copy arrays or strings with size. If you are using these either
|
||||
// change your interface, or contact me about this feature request.
|
||||
|
||||
|
||||
class nsProxyObject
|
||||
{
|
||||
public:
|
||||
nsProxyObject(nsIEventTarget *destQueue, PRInt32 proxyType,
|
||||
nsISupports *realObject);
|
||||
|
||||
void AddRef();
|
||||
void Release();
|
||||
|
||||
~nsProxyObject();
|
||||
|
||||
nsresult Post( PRUint32 methodIndex,
|
||||
nsXPTMethodInfo * info,
|
||||
nsXPTCMiniVariant * params,
|
||||
nsIInterfaceInfo * interfaceInfo);
|
||||
|
||||
nsresult PostAndWait(nsProxyObjectCallInfo *proxyInfo);
|
||||
nsISupports* GetRealObject() const { return mRealObject; }
|
||||
nsIEventTarget* GetTarget() const { return mTarget; }
|
||||
PRInt32 GetProxyType() const { return mProxyType; }
|
||||
|
||||
friend class nsProxyEventObject;
|
||||
private:
|
||||
|
||||
nsAutoRefCnt mRefCnt;
|
||||
|
||||
PRInt32 mProxyType;
|
||||
|
||||
nsCOMPtr<nsIEventTarget> mTarget; /* event target */
|
||||
|
||||
nsCOMPtr<nsISupports> mRealObject; /* the non-proxy object that this event is referring to.
|
||||
This is a strong ref. */
|
||||
|
||||
nsresult convertMiniVariantToVariant(nsXPTMethodInfo * methodInfo,
|
||||
nsXPTCMiniVariant * params,
|
||||
nsXPTCVariant **fullParam,
|
||||
uint8 *paramCount);
|
||||
};
|
||||
|
||||
|
||||
class nsProxyObjectCallInfo
|
||||
{
|
||||
public:
|
||||
|
||||
nsProxyObjectCallInfo(nsProxyObject* owner,
|
||||
nsXPTMethodInfo *methodInfo,
|
||||
PRUint32 methodIndex,
|
||||
nsXPTCVariant* parameterList,
|
||||
PRUint32 parameterCount,
|
||||
nsIRunnable *event);
|
||||
|
||||
~nsProxyObjectCallInfo();
|
||||
|
||||
PRUint32 GetMethodIndex() const { return mMethodIndex; }
|
||||
nsXPTCVariant* GetParameterList() const { return mParameterList; }
|
||||
PRUint32 GetParameterCount() const { return mParameterCount; }
|
||||
nsIRunnable* GetEvent() const { return mEvent; }
|
||||
nsresult GetResult() const { return mResult; }
|
||||
nsProxyObject* GetProxyObject() const { return mOwner; }
|
||||
|
||||
PRBool GetCompleted();
|
||||
void SetCompleted();
|
||||
void PostCompleted();
|
||||
|
||||
void SetResult(nsresult rv) { mResult = rv; }
|
||||
|
||||
nsIEventTarget* GetCallersTarget();
|
||||
void SetCallersTarget(nsIEventTarget* target);
|
||||
|
||||
private:
|
||||
|
||||
nsresult mResult; /* this is the return result of the called function */
|
||||
nsXPTMethodInfo *mMethodInfo;
|
||||
PRUint32 mMethodIndex; /* which method to be called? */
|
||||
nsXPTCVariant *mParameterList; /* marshalled in parameter buffer */
|
||||
PRUint32 mParameterCount; /* number of params */
|
||||
nsIRunnable *mEvent; /* the current runnable */
|
||||
PRInt32 mCompleted; /* is true when the method has been called. */
|
||||
|
||||
nsCOMPtr<nsIEventTarget> mCallersTarget; /* this is the dispatch target that we must post a message back to
|
||||
when we are done invoking the method (only NS_PROXY_SYNC). */
|
||||
|
||||
nsRefPtr<nsProxyObject> mOwner; /* this is the strong referenced nsProxyObject */
|
||||
|
||||
void RefCountInInterfacePointers(PRBool addRef);
|
||||
void CopyStrings(PRBool copy);
|
||||
};
|
||||
|
||||
#endif // nsProxyEvent_h__
|
||||
|
|
@ -296,6 +296,7 @@ nsProxyEventObject::GetNewOrUsedProxy(nsIEventTarget *target,
|
|||
peo = new nsProxyEventObject(target,
|
||||
proxyType,
|
||||
rootObject,
|
||||
rootObject,
|
||||
rootClazz,
|
||||
nsnull);
|
||||
if(!peo) {
|
||||
|
|
@ -345,10 +346,11 @@ nsProxyEventObject::GetNewOrUsedProxy(nsIEventTarget *target,
|
|||
return nsnull;
|
||||
}
|
||||
|
||||
peo = new nsProxyEventObject(target,
|
||||
proxyType,
|
||||
rawInterface,
|
||||
proxyClazz,
|
||||
peo = new nsProxyEventObject(target,
|
||||
proxyType,
|
||||
rawInterface,
|
||||
rootObject,
|
||||
proxyClazz,
|
||||
rootProxy);
|
||||
if (!peo) {
|
||||
// Ouch... Out of memory!
|
||||
|
|
@ -397,6 +399,7 @@ nsProxyEventObject::nsProxyEventObject()
|
|||
nsProxyEventObject::nsProxyEventObject(nsIEventTarget *target,
|
||||
PRInt32 proxyType,
|
||||
nsISupports* aObj,
|
||||
nsISupports* aRootObj,
|
||||
nsProxyEventClass* aClass,
|
||||
nsProxyEventObject* root)
|
||||
: mClass(aClass),
|
||||
|
|
@ -405,7 +408,8 @@ nsProxyEventObject::nsProxyEventObject(nsIEventTarget *target,
|
|||
{
|
||||
NS_IF_ADDREF(mRoot);
|
||||
|
||||
mProxyObject = new nsProxyObject(target, proxyType, aObj);
|
||||
// XXX protect against OOM errors
|
||||
mProxyObject = new nsProxyObject(target, proxyType, aObj, aRootObj);
|
||||
|
||||
#ifdef DEBUG_xpcom_proxy
|
||||
DebugDump("Create", 0);
|
||||
|
|
@ -446,9 +450,10 @@ nsProxyEventObject::~nsProxyEventObject()
|
|||
NS_ASSERTION(!mNext, "There are still proxies in the chain!");
|
||||
|
||||
if (realToProxyMap != nsnull) {
|
||||
nsCOMPtr<nsISupports> rootObject = do_QueryInterface(mProxyObject->mRealObject);
|
||||
nsCOMPtr<nsISupports> rootQueue = do_QueryInterface(mProxyObject->mTarget);
|
||||
nsProxyEventKey key(rootObject, rootQueue, mProxyObject->mProxyType);
|
||||
nsCOMPtr<nsISupports> rootTarget =
|
||||
do_QueryInterface(mProxyObject->mTarget);
|
||||
nsProxyEventKey key(mProxyObject->mRootObject, rootTarget,
|
||||
mProxyObject->mProxyType);
|
||||
#ifdef DEBUG_dougt
|
||||
void* value =
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ public:
|
|||
nsProxyEventObject(nsIEventTarget *target,
|
||||
PRInt32 proxyType,
|
||||
nsISupports* aObj,
|
||||
nsISupports* aRootObj, // result of QI(nsISupports)
|
||||
nsProxyEventClass* aClass,
|
||||
nsProxyEventObject* root);
|
||||
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@
|
|||
|
||||
#include "nsIRunnable.h"
|
||||
#include "nsIProxyObjectManager.h"
|
||||
#include "nsIThreadPool.h"
|
||||
#include "nsXPCOMCIDInternal.h"
|
||||
#include "nsComponentManagerUtils.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#include "nsThreadUtils.h"
|
||||
|
|
@ -419,6 +421,72 @@ public:
|
|||
};
|
||||
NS_IMPL_THREADSAFE_ISUPPORTS1(TestSyncProxyToSelf, nsIRunnable)
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// Test to make sure we can call methods on a "main thread only" object from
|
||||
// a background thread.
|
||||
|
||||
class MainThreadOnly : public nsIRunnable {
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_IMETHOD Run() {
|
||||
NS_ASSERTION(NS_IsMainThread(), "method called on wrong thread");
|
||||
*mNumRuns -= 1;
|
||||
return NS_OK;
|
||||
}
|
||||
MainThreadOnly(PRUint32 *numRuns) : mNumRuns(numRuns) {}
|
||||
~MainThreadOnly() {
|
||||
NS_ASSERTION(NS_IsMainThread(), "method called on wrong thread");
|
||||
}
|
||||
PRBool IsDone() { return mNumRuns == 0; }
|
||||
private:
|
||||
PRUint32 *mNumRuns;
|
||||
};
|
||||
NS_IMPL_ISUPPORTS1(MainThreadOnly, nsIRunnable) // not threadsafe!
|
||||
|
||||
static nsresult
|
||||
RunApartmentTest()
|
||||
{
|
||||
LOG(("RunApartmentTest: start\n"));
|
||||
|
||||
const PRUint32 numDispatched = 160;
|
||||
|
||||
PRUint32 numCompleted = 0;
|
||||
nsCOMPtr<nsIRunnable> obj = new MainThreadOnly(&numCompleted);
|
||||
|
||||
nsCOMPtr<nsIProxyObjectManager> manager =
|
||||
do_GetService(NS_XPCOMPROXY_CONTRACTID);
|
||||
|
||||
nsCOMPtr<nsIRunnable> objProxy;
|
||||
manager->GetProxyForObject(NS_PROXY_TO_CURRENT_THREAD,
|
||||
NS_GET_IID(nsIRunnable),
|
||||
obj,
|
||||
NS_PROXY_ASYNC,
|
||||
getter_AddRefs(objProxy));
|
||||
nsCOMPtr<nsIThread> thread;
|
||||
NS_NewThread(getter_AddRefs(thread));
|
||||
|
||||
obj = nsnull;
|
||||
|
||||
nsCOMPtr<nsIThreadPool> pool = do_CreateInstance(NS_THREADPOOL_CONTRACTID);
|
||||
|
||||
pool->SetThreadLimit(8);
|
||||
for (PRUint32 i = 0; i < numDispatched; ++i)
|
||||
pool->Dispatch(objProxy, NS_DISPATCH_NORMAL);
|
||||
|
||||
objProxy = nsnull;
|
||||
|
||||
nsCOMPtr<nsIThread> curThread = do_GetCurrentThread();
|
||||
while (numCompleted < numDispatched) {
|
||||
NS_ProcessNextEvent(curThread);
|
||||
}
|
||||
|
||||
pool->Shutdown();
|
||||
|
||||
LOG(("RunApartmentTest: end\n"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
|
|
@ -435,6 +503,8 @@ main(int argc, char **argv)
|
|||
NS_GetComponentRegistrar(getter_AddRefs(registrar));
|
||||
registrar->AutoRegister(nsnull);
|
||||
|
||||
RunApartmentTest();
|
||||
|
||||
nsCOMPtr<nsIThread> eventLoopThread;
|
||||
NS_NewThread(getter_AddRefs(eventLoopThread));
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче