mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-03 13:02:57 +00:00
Rewrite NS_IMPL_THREADSAFE_ADDREF and NS_IMPL_THREADSAFE_RELEASE in cross platform way instead of having separate
implementations for windows and everyone else. They are now written to use PR_AtomicIncrement and PR_AtomicDecrement. this meant adding #include "pratom.h". A side effect of this change is that no one needs to include "windows.h" in .cpp files which were implementing threadsafe interfaces. You used to have to do this before with the old implementations.
This commit is contained in:
mscott%netscape.com
parent
5c021cefde
commit
607ea9e584
@ -26,6 +26,7 @@
|
|||||||
#include "nsID.h"
|
#include "nsID.h"
|
||||||
#include "nsIID.h"
|
#include "nsIID.h"
|
||||||
#include "nsError.h"
|
#include "nsError.h"
|
||||||
|
#include "pratom.h" /* needed for PR_AtomicIncrement and PR_AtomicDecrement */
|
||||||
|
|
||||||
#if defined(NS_MT_SUPPORTED)
|
#if defined(NS_MT_SUPPORTED)
|
||||||
#include "prcmon.h"
|
#include "prcmon.h"
|
||||||
@ -370,59 +371,31 @@ NS_IMETHODIMP Class::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
|||||||
* Use this macro to implement the AddRef method for a given <i>_class</i>
|
* Use this macro to implement the AddRef method for a given <i>_class</i>
|
||||||
* @param _class The name of the class implementing the method
|
* @param _class The name of the class implementing the method
|
||||||
*/
|
*/
|
||||||
#if defined(XP_PC)
|
|
||||||
#define NS_IMPL_THREADSAFE_ADDREF(_class) \
|
|
||||||
NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \
|
|
||||||
{ \
|
|
||||||
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt"); \
|
|
||||||
return InterlockedIncrement((LONG*)&mRefCnt); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* ! XP_PC */
|
|
||||||
#define NS_IMPL_THREADSAFE_ADDREF(_class) \
|
#define NS_IMPL_THREADSAFE_ADDREF(_class) \
|
||||||
nsrefcnt _class::AddRef(void) \
|
NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \
|
||||||
{ \
|
{ \
|
||||||
nsrefcnt count; \
|
|
||||||
NS_LOCK_INSTANCE(); \
|
|
||||||
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt"); \
|
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt"); \
|
||||||
count = ++mRefCnt; \
|
return PR_AtomicIncrement((PRInt32*)&mRefCnt); \
|
||||||
NS_UNLOCK_INSTANCE(); \
|
|
||||||
return count; \
|
|
||||||
}
|
}
|
||||||
#endif /* ! XP_PC */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use this macro to implement the Release method for a given <i>_class</i>
|
* Use this macro to implement the Release method for a given <i>_class</i>
|
||||||
* @param _class The name of the class implementing the method
|
* @param _class The name of the class implementing the method
|
||||||
*/
|
*/
|
||||||
#if defined(XP_PC)
|
|
||||||
#define NS_IMPL_THREADSAFE_RELEASE(_class) \
|
|
||||||
NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \
|
|
||||||
{ \
|
|
||||||
NS_PRECONDITION(0 != mRefCnt, "dup release"); \
|
|
||||||
if (0 == InterlockedDecrement((LONG*)&mRefCnt)) { \
|
|
||||||
NS_DELETEXPCOM(this); \
|
|
||||||
return 0; \
|
|
||||||
} \
|
|
||||||
return mRefCnt; /* Not threadsafe but who cares. */ \
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* ! XP_PC */
|
|
||||||
#define NS_IMPL_THREADSAFE_RELEASE(_class) \
|
#define NS_IMPL_THREADSAFE_RELEASE(_class) \
|
||||||
nsrefcnt _class::Release(void) \
|
nsrefcnt _class::Release(void) \
|
||||||
{ \
|
{ \
|
||||||
nsrefcnt count; \
|
nsrefcnt count; \
|
||||||
NS_PRECONDITION(0 != mRefCnt, "dup release"); \
|
NS_PRECONDITION(0 != mRefCnt, "dup release"); \
|
||||||
NS_LOCK_INSTANCE(); \
|
count = PR_AtomicDecrement((PRInt32 *)&mRefCnt); \
|
||||||
count = --mRefCnt; \
|
|
||||||
NS_UNLOCK_INSTANCE(); \
|
|
||||||
if (0 == count) { \
|
if (0 == count) { \
|
||||||
NS_DELETEXPCOM(this); \
|
NS_DELETEXPCOM(this); \
|
||||||
return 0; \
|
return 0; \
|
||||||
} \
|
} \
|
||||||
return count; \
|
return count; \
|
||||||
}
|
}
|
||||||
#endif /* ! XP_PC */
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|||||||
@ -26,6 +26,7 @@
|
|||||||
#include "nsID.h"
|
#include "nsID.h"
|
||||||
#include "nsIID.h"
|
#include "nsIID.h"
|
||||||
#include "nsError.h"
|
#include "nsError.h"
|
||||||
|
#include "pratom.h" /* needed for PR_AtomicIncrement and PR_AtomicDecrement */
|
||||||
|
|
||||||
#if defined(NS_MT_SUPPORTED)
|
#if defined(NS_MT_SUPPORTED)
|
||||||
#include "prcmon.h"
|
#include "prcmon.h"
|
||||||
@ -370,59 +371,31 @@ NS_IMETHODIMP Class::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
|||||||
* Use this macro to implement the AddRef method for a given <i>_class</i>
|
* Use this macro to implement the AddRef method for a given <i>_class</i>
|
||||||
* @param _class The name of the class implementing the method
|
* @param _class The name of the class implementing the method
|
||||||
*/
|
*/
|
||||||
#if defined(XP_PC)
|
|
||||||
#define NS_IMPL_THREADSAFE_ADDREF(_class) \
|
|
||||||
NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \
|
|
||||||
{ \
|
|
||||||
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt"); \
|
|
||||||
return InterlockedIncrement((LONG*)&mRefCnt); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* ! XP_PC */
|
|
||||||
#define NS_IMPL_THREADSAFE_ADDREF(_class) \
|
#define NS_IMPL_THREADSAFE_ADDREF(_class) \
|
||||||
nsrefcnt _class::AddRef(void) \
|
NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \
|
||||||
{ \
|
{ \
|
||||||
nsrefcnt count; \
|
|
||||||
NS_LOCK_INSTANCE(); \
|
|
||||||
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt"); \
|
NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "illegal refcnt"); \
|
||||||
count = ++mRefCnt; \
|
return PR_AtomicIncrement((PRInt32*)&mRefCnt); \
|
||||||
NS_UNLOCK_INSTANCE(); \
|
|
||||||
return count; \
|
|
||||||
}
|
}
|
||||||
#endif /* ! XP_PC */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use this macro to implement the Release method for a given <i>_class</i>
|
* Use this macro to implement the Release method for a given <i>_class</i>
|
||||||
* @param _class The name of the class implementing the method
|
* @param _class The name of the class implementing the method
|
||||||
*/
|
*/
|
||||||
#if defined(XP_PC)
|
|
||||||
#define NS_IMPL_THREADSAFE_RELEASE(_class) \
|
|
||||||
NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \
|
|
||||||
{ \
|
|
||||||
NS_PRECONDITION(0 != mRefCnt, "dup release"); \
|
|
||||||
if (0 == InterlockedDecrement((LONG*)&mRefCnt)) { \
|
|
||||||
NS_DELETEXPCOM(this); \
|
|
||||||
return 0; \
|
|
||||||
} \
|
|
||||||
return mRefCnt; /* Not threadsafe but who cares. */ \
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* ! XP_PC */
|
|
||||||
#define NS_IMPL_THREADSAFE_RELEASE(_class) \
|
#define NS_IMPL_THREADSAFE_RELEASE(_class) \
|
||||||
nsrefcnt _class::Release(void) \
|
nsrefcnt _class::Release(void) \
|
||||||
{ \
|
{ \
|
||||||
nsrefcnt count; \
|
nsrefcnt count; \
|
||||||
NS_PRECONDITION(0 != mRefCnt, "dup release"); \
|
NS_PRECONDITION(0 != mRefCnt, "dup release"); \
|
||||||
NS_LOCK_INSTANCE(); \
|
count = PR_AtomicDecrement((PRInt32 *)&mRefCnt); \
|
||||||
count = --mRefCnt; \
|
|
||||||
NS_UNLOCK_INSTANCE(); \
|
|
||||||
if (0 == count) { \
|
if (0 == count) { \
|
||||||
NS_DELETEXPCOM(this); \
|
NS_DELETEXPCOM(this); \
|
||||||
return 0; \
|
return 0; \
|
||||||
} \
|
} \
|
||||||
return count; \
|
return count; \
|
||||||
}
|
}
|
||||||
#endif /* ! XP_PC */
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user