wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 884061 - Part 2: Add NS_DECL_THREADSAFE_ISUPPORTS, r=jlebar.

Browse Source 
--HG--
extra : rebase_source : 70514a7fc7760cadf8608e038d686ad5b2542571
This commit is contained in:
Joshua Cranmer 2013-07-13 20:28:54 -05:00
parent 0e3b26bd30
commit b804383c82
1 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
xpcom/glue/nsISupportsImpl.h
View File

@ -202,10 +202,11 @@ class nsAutoRefCnt {
nsrefcnt operator=(nsrefcnt aValue) { return (mValue = aValue); }
operator nsrefcnt() const { return mValue; }
nsrefcnt get() const { return mValue; }
static const bool isThreadSafe = false;
private:
// do not define these to enforce the faster prefix notation
nsrefcnt operator++(int);
nsrefcnt operator--(int);
nsrefcnt operator++(int) MOZ_DELETE;
nsrefcnt operator--(int) MOZ_DELETE;
nsrefcnt mValue;
};
@ -223,6 +224,8 @@ class ThreadSafeAutoRefCnt {
MOZ_ALWAYS_INLINE nsrefcnt operator=(nsrefcnt aValue) { return (mValue = aValue); }
MOZ_ALWAYS_INLINE operator nsrefcnt() const { return mValue; }
MOZ_ALWAYS_INLINE nsrefcnt get() const { return mValue; }
static const bool isThreadSafe = true;
private:
nsrefcnt operator++(int) MOZ_DELETE;
nsrefcnt operator--(int) MOZ_DELETE;
@ -232,6 +235,19 @@ class ThreadSafeAutoRefCnt {
Atomic<nsrefcnt> mValue;
};
}
// Temporary declarations until NS_IMPL_THREADSAFE_ADDREF/RELEASE are deleted.
inline nsrefcnt
NS_AtomicIncrementRefcnt(mozilla::ThreadSafeAutoRefCnt &refcnt)
{
return ++refcnt;
}
inline nsrefcnt
NS_AtomicDecrementRefcnt(mozilla::ThreadSafeAutoRefCnt &refcnt)
{
return --refcnt;
}
#endif
///////////////////////////////////////////////////////////////////////////////
@ -252,6 +268,17 @@ protected: \
NS_DECL_OWNINGTHREAD \
public:
#define NS_DECL_THREADSAFE_ISUPPORTS \
public: \
NS_IMETHOD QueryInterface(REFNSIID aIID, \
void** aInstancePtr); \
NS_IMETHOD_(nsrefcnt) AddRef(void); \
NS_IMETHOD_(nsrefcnt) Release(void); \
protected: \
::mozilla::ThreadSafeAutoRefCnt mRefCnt; \
NS_DECL_OWNINGTHREAD \
public:
#define NS_DECL_CYCLE_COLLECTING_ISUPPORTS \
public: \
NS_IMETHOD QueryInterface(REFNSIID aIID, \
@ -418,10 +445,11 @@ public:
NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \
{ \
MOZ_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt"); \
NS_ASSERT_OWNINGTHREAD_AND_NOT_CCTHREAD(_class); \
++mRefCnt; \
NS_LOG_ADDREF(this, mRefCnt, #_class, sizeof(*this)); \
return mRefCnt; \
if (!mRefCnt.isThreadSafe) \
NS_ASSERT_OWNINGTHREAD_AND_NOT_CCTHREAD(_class); \
nsrefcnt count = ++mRefCnt; \
NS_LOG_ADDREF(this, count, #_class, sizeof(*this)); \
return count; \
}
/**
@ -461,16 +489,18 @@ NS_IMETHODIMP_(nsrefcnt) _class::AddRef(void) \
NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \
{ \
MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release"); \
NS_ASSERT_OWNINGTHREAD_AND_NOT_CCTHREAD(_class); \
--mRefCnt; \
NS_LOG_RELEASE(this, mRefCnt, #_class); \
if (mRefCnt == 0) { \
NS_ASSERT_OWNINGTHREAD(_class); \
if (!mRefCnt.isThreadSafe) \
NS_ASSERT_OWNINGTHREAD_AND_NOT_CCTHREAD(_class); \
nsrefcnt count = --mRefCnt; \
NS_LOG_RELEASE(this, count, #_class); \
if (count == 0) { \
if (!mRefCnt.isThreadSafe) \
NS_ASSERT_OWNINGTHREAD(_class); \
mRefCnt = 1; /* stabilize */ \
_destroy; \
return 0; \
} \
return mRefCnt; \
return count; \
}
/**