Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug #78016 r=dbradley, sr=dbaron

Browse Source
This commit is contained in:
scc%mozilla.org 2003-02-25 15:53:36 +00:00
parent 90c01ecdb6
commit 10ccbee43a
4 changed files with 91 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xpcom/base/nsTraceRefcnt.h
View File

@ -124,14 +124,16 @@ PR_END_MACRO
// nsCOMPtr.h allows these macros to be defined by clients
// These logging functions require dynamic_cast<void *>, so we don't
// define these macros if we don't have dynamic_cast.
#define NSCAP_LOG_ASSIGNMENT(_c, _p) \
if ((_p)) nsTraceRefcnt::LogAddCOMPtr((_c),NS_STATIC_CAST(nsISupports*,_p))
#define NSCAP_LOG_ASSIGNMENT(_c, _p) \
if (_p) \
nsTraceRefcnt::LogAddCOMPtr((_c),NS_STATIC_CAST(nsISupports*,_p))
#define NSCAP_RELEASE(_c, _p); \
if ((_p)) { \
nsTraceRefcnt::LogReleaseCOMPtr((_c),NS_STATIC_CAST(nsISupports*,_p)); \
NS_RELEASE(_p); \
}
#define NSCAP_LOG_RELEASE(_c, _p) \
if (_p) \
nsTraceRefcnt::LogReleaseCOMPtr((_c), NS_STATIC_CAST(nsISupports*,_p))
#define NSCAP_ADDREF(_c, _p) NS_ADDREF(_p)
#define NSCAP_RELEASE(_c, _p) NS_RELEASE(_p)
#endif /* HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR */

16
xpcom/base/nsTraceRefcntImpl.h
View File

@ -124,14 +124,16 @@ PR_END_MACRO
// nsCOMPtr.h allows these macros to be defined by clients
// These logging functions require dynamic_cast<void *>, so we don't
// define these macros if we don't have dynamic_cast.
#define NSCAP_LOG_ASSIGNMENT(_c, _p) \
if ((_p)) nsTraceRefcnt::LogAddCOMPtr((_c),NS_STATIC_CAST(nsISupports*,_p))
#define NSCAP_LOG_ASSIGNMENT(_c, _p) \
if (_p) \
nsTraceRefcnt::LogAddCOMPtr((_c),NS_STATIC_CAST(nsISupports*,_p))
#define NSCAP_RELEASE(_c, _p); \
if ((_p)) { \
nsTraceRefcnt::LogReleaseCOMPtr((_c),NS_STATIC_CAST(nsISupports*,_p)); \
NS_RELEASE(_p); \
}
#define NSCAP_LOG_RELEASE(_c, _p) \
if (_p) \
nsTraceRefcnt::LogReleaseCOMPtr((_c), NS_STATIC_CAST(nsISupports*,_p))
#define NSCAP_ADDREF(_c, _p) NS_ADDREF(_p)
#define NSCAP_RELEASE(_c, _p) NS_RELEASE(_p)
#endif /* HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR */

1
xpcom/glue/nsCOMPtr.cpp
View File

@ -60,6 +60,7 @@ nsQueryInterface::operator()( const nsIID& aIID, void** answer ) const
#ifdef NSCAP_FEATURE_FACTOR_DESTRUCTOR
nsCOMPtr_base::~nsCOMPtr_base()
{
NSCAP_LOG_RELEASE(this, mRawPtr);
if ( mRawPtr )
NSCAP_RELEASE(this, mRawPtr);
}

78
xpcom/glue/nsCOMPtr.h
View File

@ -151,7 +151,11 @@
#define NSCAP_LOG_EXTERNAL_ASSIGNMENT
#else
// ...otherwise, just strip it out of the code
#define NSCAP_LOG_ASSIGNMENT(this, ptr);
#define NSCAP_LOG_ASSIGNMENT(this, ptr)
#endif
#ifndef NSCAP_LOG_RELEASE
#define NSCAP_LOG_RELEASE(this, ptr)
#endif
@ -271,7 +275,7 @@ getter_AddRefs( T* aRawPtr )
template <class T>
inline
const already_AddRefed<T>
getter_AddRefs( const already_AddRefed<T>& aAlreadyAddRefedPtr )
getter_AddRefs( const already_AddRefed<T> aAlreadyAddRefedPtr )
{
return aAlreadyAddRefedPtr;
}
@ -431,6 +435,7 @@ class nsCOMPtr_base
nsISupports* oldPtr = mRawPtr;
mRawPtr = newPtr;
NSCAP_LOG_ASSIGNMENT(this, newPtr);
NSCAP_LOG_RELEASE(this, oldPtr);
if ( oldPtr )
NSCAP_RELEASE(this, oldPtr);
}
@ -468,6 +473,7 @@ class nsCOMPtr
T* oldPtr = mRawPtr;
mRawPtr = newPtr;
NSCAP_LOG_ASSIGNMENT(this, newPtr);
NSCAP_LOG_RELEASE(this, oldPtr);
if ( oldPtr )
NSCAP_RELEASE(this, oldPtr);
}
@ -486,6 +492,7 @@ class nsCOMPtr
#ifndef NSCAP_FEATURE_FACTOR_DESTRUCTOR
~nsCOMPtr()
{
NSCAP_LOG_RELEASE(this, mRawPtr);
if ( mRawPtr )
NSCAP_RELEASE(this, mRawPtr);
}
@ -617,6 +624,40 @@ class nsCOMPtr
}
#endif
void
swap( nsCOMPtr<T>& rhs )
// ...exchange ownership with |rhs|; can save a pair of refcount operations
{
#ifdef NSCAP_FEATURE_DEBUG_PTR_TYPES
T* temp = rhs.mRawPtr;
#else
nsISupports* temp = rhs.mRawPtr;
#endif
NSCAP_LOG_ASSIGNMENT(&rhs, mRawPtr);
NSCAP_LOG_ASSIGNMENT(this, temp);
NSCAP_LOG_RELEASE(this, mRawPtr);
NSCAP_LOG_RELEASE(&rhs, temp);
rhs.mRawPtr = mRawPtr;
mRawPtr = temp;
// |rhs| maintains the same invariants, so we don't need to |NSCAP_ASSERT_NO_QUERY_NEEDED|
}
void
swap( T*& rhs )
// ...exchange ownership with |rhs|; can save a pair of refcount operations
{
#ifdef NSCAP_FEATURE_DEBUG_PTR_TYPES
T* temp = rhs;
#else
nsISupports* temp = rhs;
#endif
NSCAP_LOG_ASSIGNMENT(this, temp);
NSCAP_LOG_RELEASE(this, mRawPtr);
rhs = mRawPtr;
mRawPtr = temp;
NSCAP_ASSERT_NO_QUERY_NEEDED();
}
// Other pointer operators
@ -727,10 +768,11 @@ class nsCOMPtr<nsISupports>
#ifndef NSCAP_FEATURE_FACTOR_DESTRUCTOR
~nsCOMPtr()
{
if ( mRawPtr )
NSCAP_RELEASE(this, mRawPtr);
}
{
NSCAP_LOG_RELEASE(this, mRawPtr);
if ( mRawPtr )
NSCAP_RELEASE(this, mRawPtr);
}
#endif
@ -813,6 +855,30 @@ class nsCOMPtr<nsISupports>
return *this;
}
void
swap( nsCOMPtr<nsISupports>& rhs )
// ...exchange ownership with |rhs|; can save a pair of refcount operations
{
nsISupports* temp = rhs.mRawPtr;
NSCAP_LOG_ASSIGNMENT(&rhs, mRawPtr);
NSCAP_LOG_ASSIGNMENT(this, temp);
NSCAP_LOG_RELEASE(this, mRawPtr);
NSCAP_LOG_RELEASE(&rhs, temp);
rhs.mRawPtr = mRawPtr;
mRawPtr = temp;
}
void
swap( nsISupports*& rhs )
// ...exchange ownership with |rhs|; can save a pair of refcount operations
{
nsISupports* temp = rhs;
NSCAP_LOG_ASSIGNMENT(this, temp);
NSCAP_LOG_RELEASE(this, mRawPtr);
rhs = mRawPtr;
mRawPtr = temp;
}
// Other pointer operators