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 976350 patch 2: Rename nsTraceRefcntImpl to nsTraceRefcnt. r=bsmedberg

Browse Source 
Now that bug 975295 removed the obsolete wrapper class, we can rename
nsTraceRefcntImpl back to its correct pre-XPCOM-glue name,
nsTraceRefcnt.

The best part is that the one place where indentation should have needed
fixing, nsTraceRefcnt::DemangleSymbol, never had its indentation fixed
for the previous renaming.

--HG--
rename : xpcom/base/nsTraceRefcntImpl.cpp => xpcom/base/nsTraceRefcnt.cpp
rename : xpcom/base/nsTraceRefcntImpl.h => xpcom/base/nsTraceRefcnt.h
This commit is contained in:
L. David Baron 2014-02-26 13:36:36 -08:00
parent 4f04bcdc57
commit 2b5d6b3cfb
15 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/src/base/Logging.cpp
View File

@ -17,7 +17,7 @@
#include "nsIChannel.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsISelectionPrivate.h"
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#include "nsIWebProgress.h"
#include "prenv.h"
#include "nsIDocShellTreeItem.h"
@ -800,7 +800,7 @@ logging::Stack()
{
if (IsEnabled(eStack)) {
printf(" stack: \n");
nsTraceRefcntImpl::WalkTheStack(stdout);
nsTraceRefcnt::WalkTheStack(stdout);
}
}

8
js/src/devtools/rootAnalysis/annotations.js
View File

@ -13,10 +13,10 @@ var ignoreIndirectCalls = {
"mozalloc_oom.cpp:void (* gAbortHandler)(size_t)" : true,
// I don't know why these are getting truncated
"nsTraceRefcntImpl.cpp:void (* leakyLogAddRef)(void*": true,
"nsTraceRefcntImpl.cpp:void (* leakyLogAddRef)(void*, int, int)": true,
"nsTraceRefcntImpl.cpp:void (* leakyLogRelease)(void*": true,
"nsTraceRefcntImpl.cpp:void (* leakyLogRelease)(void*, int, int)": true,
"nsTraceRefcnt.cpp:void (* leakyLogAddRef)(void*": true,
"nsTraceRefcnt.cpp:void (* leakyLogAddRef)(void*, int, int)": true,
"nsTraceRefcnt.cpp:void (* leakyLogRelease)(void*": true,
"nsTraceRefcnt.cpp:void (* leakyLogRelease)(void*, int, int)": true,
};
function indirectCallCannotGC(fullCaller, fullVariable)

12
netwerk/protocol/about/nsAboutBloat.cpp
View File

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
// if NS_BUILD_REFCNT_LOGGING isn't defined, don't try to build
#ifdef NS_BUILD_REFCNT_LOGGING
@ -29,7 +29,7 @@ nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result)
rv = aURI->GetPath(path);
if (NS_FAILED(rv)) return rv;
nsTraceRefcntImpl::StatisticsType statType = nsTraceRefcntImpl::ALL_STATS;
nsTraceRefcnt::StatisticsType statType = nsTraceRefcnt::ALL_STATS;
bool clear = false;
bool leaks = false;
@ -38,7 +38,7 @@ nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result)
nsAutoCString param;
(void)path.Right(param, path.Length() - (pos+1));
if (param.EqualsLiteral("new"))
statType = nsTraceRefcntImpl::NEW_STATS;
statType = nsTraceRefcnt::NEW_STATS;
else if (param.EqualsLiteral("clear"))
clear = true;
else if (param.EqualsLiteral("leaks"))
@ -47,7 +47,7 @@ nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result)
nsCOMPtr<nsIInputStream> inStr;
if (clear) {
nsTraceRefcntImpl::ResetStatistics();
nsTraceRefcnt::ResetStatistics();
rv = NS_NewCStringInputStream(getter_AddRefs(inStr),
NS_LITERAL_CSTRING("Bloat statistics cleared."));
@ -83,7 +83,7 @@ nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result)
}
nsAutoCString dumpFileName;
if (statType == nsTraceRefcntImpl::ALL_STATS)
if (statType == nsTraceRefcnt::ALL_STATS)
dumpFileName.AssignLiteral("all-");
else
dumpFileName.AssignLiteral("new-");
@ -99,7 +99,7 @@ nsAboutBloat::NewChannel(nsIURI *aURI, nsIChannel **result)
rv = file->OpenANSIFileDesc("w", &out);
if (NS_FAILED(rv)) return rv;
rv = nsTraceRefcntImpl::DumpStatistics(statType, out);
rv = nsTraceRefcnt::DumpStatistics(statType, out);
::fclose(out);
if (NS_FAILED(rv)) return rv;

4
tools/rb/fix-linux-stack.pl
View File

@ -10,8 +10,8 @@
# nsTraceRefcnt's Linux stack walking code. This is useful for two
# things:
# (1) Getting line number information out of
# |nsTraceRefcntImpl::WalkTheStack|'s output in debug builds.
# (2) Getting function names out of |nsTraceRefcntImpl::WalkTheStack|'s
# |nsTraceRefcnt::WalkTheStack|'s output in debug builds.
# (2) Getting function names out of |nsTraceRefcnt::WalkTheStack|'s
# output on optimized builds (where it mostly prints UNKNOWN
# because only a handful of symbols are exported from component
# libraries).

4
tools/rb/fix_macosx_stack.py
View File

@ -7,8 +7,8 @@
# This script uses atos to process the output of nsTraceRefcnt's Mac OS
# X stack walking code. This is useful for two things:
# (1) Getting line number information out of
# |nsTraceRefcntImpl::WalkTheStack|'s output in debug builds.
# (2) Getting function names out of |nsTraceRefcntImpl::WalkTheStack|'s
# |nsTraceRefcnt::WalkTheStack|'s output in debug builds.
# (2) Getting function names out of |nsTraceRefcnt::WalkTheStack|'s
# output on all builds (where it mostly prints UNKNOWN because only
# a handful of symbols are exported from component libraries).
#

4
xpcom/base/moz.build
View File

@ -56,7 +56,7 @@ EXPORTS += [
'nsISupportsObsolete.h',
'nsObjCExceptions.h',
'nsStackWalk.h',
'nsTraceRefcntImpl.h',
'nsTraceRefcnt.h',
'nsWeakPtr.h',
]
@ -110,7 +110,7 @@ UNIFIED_SOURCES += [
'nsMessageLoop.cpp',
'nsSecurityConsoleMessage.cpp',
'nsSystemInfo.cpp',
'nsTraceRefcntImpl.cpp',
'nsTraceRefcnt.cpp',
'nsUUIDGenerator.cpp',
'nsVersionComparatorImpl.cpp',
'VisualEventTracer.cpp',

8
xpcom/base/nsDebugImpl.cpp
View File

@ -30,7 +30,7 @@
#include <stdlib.h>
#endif
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#if defined(XP_UNIX)
#include <signal.h>
@ -373,7 +373,7 @@ NS_DebugBreak(uint32_t aSeverity, const char *aStr, const char *aExpr,
RealBreak();
#endif
#ifdef DEBUG
nsTraceRefcntImpl::WalkTheStack(stderr);
nsTraceRefcnt::WalkTheStack(stderr);
#endif
Abort(buf.buffer);
return;
@ -397,11 +397,11 @@ NS_DebugBreak(uint32_t aSeverity, const char *aStr, const char *aExpr,
return;
case NS_ASSERT_STACK:
nsTraceRefcntImpl::WalkTheStack(stderr);
nsTraceRefcnt::WalkTheStack(stderr);
return;
case NS_ASSERT_STACK_AND_ABORT:
nsTraceRefcntImpl::WalkTheStack(stderr);
nsTraceRefcnt::WalkTheStack(stderr);
// Fall through to abort
case NS_ASSERT_ABORT:

54
xpcom/base/nsTraceRefcntImpl.cpp → xpcom/base/nsTraceRefcnt.cpp
View File

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#include "mozilla/IntegerPrintfMacros.h"
#include "nsXPCOMPrivate.h"
#include "nscore.h"
@ -316,7 +316,7 @@ public:
void DumpTotal(FILE* out) {
mClassSize /= mAllStats.mCreates;
Dump(-1, out, nsTraceRefcntImpl::ALL_STATS);
Dump(-1, out, nsTraceRefcnt::ALL_STATS);
}
static bool HaveLeaks(nsTraceRefcntStats* stats) {
@ -324,11 +324,11 @@ public:
(stats->mCreates != stats->mDestroys));
}
bool PrintDumpHeader(FILE* out, const char* msg, nsTraceRefcntImpl::StatisticsType type) {
bool PrintDumpHeader(FILE* out, const char* msg, nsTraceRefcnt::StatisticsType type) {
fprintf(out, "\n== BloatView: %s, %s process %d\n", msg,
XRE_ChildProcessTypeToString(XRE_GetProcessType()), getpid());
nsTraceRefcntStats& stats =
(type == nsTraceRefcntImpl::NEW_STATS) ? mNewStats : mAllStats;
(type == nsTraceRefcnt::NEW_STATS) ? mNewStats : mAllStats;
if (gLogLeaksOnly && !HaveLeaks(&stats))
return false;
@ -342,8 +342,8 @@ public:
return true;
}
void Dump(int i, FILE* out, nsTraceRefcntImpl::StatisticsType type) {
nsTraceRefcntStats* stats = (type == nsTraceRefcntImpl::NEW_STATS) ? &mNewStats : &mAllStats;
void Dump(int i, FILE* out, nsTraceRefcnt::StatisticsType type) {
nsTraceRefcntStats* stats = (type == nsTraceRefcnt::NEW_STATS) ? &mNewStats : &mAllStats;
if (gLogLeaksOnly && !HaveLeaks(stats)) {
return;
}
@ -479,7 +479,7 @@ class nsDefaultComparator <BloatEntry*, BloatEntry*> {
#endif /* NS_IMPL_REFCNT_LOGGING */
nsresult
nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
nsTraceRefcnt::DumpStatistics(StatisticsType type, FILE* out)
{
#ifdef NS_IMPL_REFCNT_LOGGING
if (gBloatLog == nullptr || gBloatView == nullptr) {
@ -527,7 +527,7 @@ nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
fprintf(out, "\n");
}
fprintf(out, "nsTraceRefcntImpl::DumpStatistics: %d entries\n", count);
fprintf(out, "nsTraceRefcnt::DumpStatistics: %d entries\n", count);
if (gSerialNumbers) {
fprintf(out, "\nSerial Numbers of Leaked Objects:\n");
@ -542,7 +542,7 @@ nsTraceRefcntImpl::DumpStatistics(StatisticsType type, FILE* out)
}
void
nsTraceRefcntImpl::ResetStatistics()
nsTraceRefcnt::ResetStatistics()
{
#ifdef NS_IMPL_REFCNT_LOGGING
LOCK_TRACELOG();
@ -856,7 +856,7 @@ static void PrintStackFrame(void *aPC, void *aSP, void *aClosure)
}
void
nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
nsTraceRefcnt::WalkTheStack(FILE* aStream)
{
#ifdef STACKWALKING_AVAILABLE
NS_StackWalk(PrintStackFrame, /* skipFrames */ 2, /* maxFrames */ 0, aStream,
@ -874,7 +874,7 @@ nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
#endif // MOZ_DEMANGLE_SYMBOLS
void
nsTraceRefcntImpl::DemangleSymbol(const char * aSymbol,
nsTraceRefcnt::DemangleSymbol(const char * aSymbol,
char * aBuffer,
int aBufLen)
{
@ -908,7 +908,7 @@ NS_LogInit()
#endif
#ifdef NS_IMPL_REFCNT_LOGGING
if (++gInitCount)
nsTraceRefcntImpl::SetActivityIsLegal(true);
nsTraceRefcnt::SetActivityIsLegal(true);
#endif
#ifdef NS_TRACE_MALLOC
@ -950,12 +950,12 @@ LogTerm()
#endif
if (gInitialized) {
nsTraceRefcntImpl::DumpStatistics();
nsTraceRefcntImpl::ResetStatistics();
nsTraceRefcnt::DumpStatistics();
nsTraceRefcnt::ResetStatistics();
}
nsTraceRefcntImpl::Shutdown();
nsTraceRefcnt::Shutdown();
#ifdef NS_IMPL_REFCNT_LOGGING
nsTraceRefcntImpl::SetActivityIsLegal(false);
nsTraceRefcnt::SetActivityIsLegal(false);
gActivityTLS = BAD_TLS_INDEX;
#endif
}
@ -1001,7 +1001,7 @@ NS_LogAddRef(void* aPtr, nsrefcnt aRefcnt,
if (aRefcnt == 1 && gAllocLog && loggingThisType && loggingThisObject) {
fprintf(gAllocLog, "\n<%s> 0x%08X %" PRIdPTR " Create\n",
aClazz, NS_PTR_TO_INT32(aPtr), serialno);
nsTraceRefcntImpl::WalkTheStack(gAllocLog);
nsTraceRefcnt::WalkTheStack(gAllocLog);
}
if (gRefcntsLog && loggingThisType && loggingThisObject) {
@ -1012,7 +1012,7 @@ NS_LogAddRef(void* aPtr, nsrefcnt aRefcnt,
// Can't use PR_LOG(), b/c it truncates the line
fprintf(gRefcntsLog,
"\n<%s> 0x%08X %" PRIdPTR " AddRef %d\n", aClazz, NS_PTR_TO_INT32(aPtr), serialno, aRefcnt);
nsTraceRefcntImpl::WalkTheStack(gRefcntsLog);
nsTraceRefcnt::WalkTheStack(gRefcntsLog);
fflush(gRefcntsLog);
}
}
@ -1060,7 +1060,7 @@ NS_LogRelease(void* aPtr, nsrefcnt aRefcnt, const char* aClazz)
// Can't use PR_LOG(), b/c it truncates the line
fprintf(gRefcntsLog,
"\n<%s> 0x%08X %" PRIdPTR " Release %d\n", aClazz, NS_PTR_TO_INT32(aPtr), serialno, aRefcnt);
nsTraceRefcntImpl::WalkTheStack(gRefcntsLog);
nsTraceRefcnt::WalkTheStack(gRefcntsLog);
fflush(gRefcntsLog);
}
}
@ -1072,7 +1072,7 @@ NS_LogRelease(void* aPtr, nsrefcnt aRefcnt, const char* aClazz)
fprintf(gAllocLog,
"\n<%s> 0x%08X %" PRIdPTR " Destroy\n",
aClazz, NS_PTR_TO_INT32(aPtr), serialno);
nsTraceRefcntImpl::WalkTheStack(gAllocLog);
nsTraceRefcnt::WalkTheStack(gAllocLog);
}
if (aRefcnt == 0 && gSerialNumbers && loggingThisType) {
@ -1112,7 +1112,7 @@ NS_LogCtor(void* aPtr, const char* aType, uint32_t aInstanceSize)
if (gAllocLog && loggingThisType && loggingThisObject) {
fprintf(gAllocLog, "\n<%s> 0x%08X %" PRIdPTR " Ctor (%d)\n",
aType, NS_PTR_TO_INT32(aPtr), serialno, aInstanceSize);
nsTraceRefcntImpl::WalkTheStack(gAllocLog);
nsTraceRefcnt::WalkTheStack(gAllocLog);
}
UNLOCK_TRACELOG();
@ -1153,7 +1153,7 @@ NS_LogDtor(void* aPtr, const char* aType, uint32_t aInstanceSize)
if (gAllocLog && loggingThisType && loggingThisObject) {
fprintf(gAllocLog, "\n<%s> 0x%08X %" PRIdPTR " Dtor (%d)\n",
aType, NS_PTR_TO_INT32(aPtr), serialno, aInstanceSize);
nsTraceRefcntImpl::WalkTheStack(gAllocLog);
nsTraceRefcnt::WalkTheStack(gAllocLog);
}
UNLOCK_TRACELOG();
@ -1194,7 +1194,7 @@ NS_LogCOMPtrAddRef(void* aCOMPtr, nsISupports* aObject)
if (gCOMPtrLog && loggingThisObject) {
fprintf(gCOMPtrLog, "\n<?> 0x%08X %" PRIdPTR " nsCOMPtrAddRef %d 0x%08X\n",
NS_PTR_TO_INT32(object), serialno, count?(*count):-1, NS_PTR_TO_INT32(aCOMPtr));
nsTraceRefcntImpl::WalkTheStack(gCOMPtrLog);
nsTraceRefcnt::WalkTheStack(gCOMPtrLog);
}
UNLOCK_TRACELOG();
@ -1235,7 +1235,7 @@ NS_LogCOMPtrRelease(void* aCOMPtr, nsISupports* aObject)
if (gCOMPtrLog && loggingThisObject) {
fprintf(gCOMPtrLog, "\n<?> 0x%08X %" PRIdPTR " nsCOMPtrRelease %d 0x%08X\n",
NS_PTR_TO_INT32(object), serialno, count?(*count):-1, NS_PTR_TO_INT32(aCOMPtr));
nsTraceRefcntImpl::WalkTheStack(gCOMPtrLog);
nsTraceRefcnt::WalkTheStack(gCOMPtrLog);
}
UNLOCK_TRACELOG();
@ -1244,7 +1244,7 @@ NS_LogCOMPtrRelease(void* aCOMPtr, nsISupports* aObject)
}
void
nsTraceRefcntImpl::Startup()
nsTraceRefcnt::Startup()
{
}
@ -1258,7 +1258,7 @@ static void maybeUnregisterAndCloseFile(FILE *&f) {
}
void
nsTraceRefcntImpl::Shutdown()
nsTraceRefcnt::Shutdown()
{
#ifdef NS_IMPL_REFCNT_LOGGING
@ -1287,7 +1287,7 @@ nsTraceRefcntImpl::Shutdown()
}
void
nsTraceRefcntImpl::SetActivityIsLegal(bool aLegal)
nsTraceRefcnt::SetActivityIsLegal(bool aLegal)
{
#ifdef NS_IMPL_REFCNT_LOGGING
if (gActivityTLS == BAD_TLS_INDEX)

6
xpcom/base/nsTraceRefcntImpl.h → xpcom/base/nsTraceRefcnt.h
View File

@ -2,13 +2,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef nsTraceRefcntImpl_h___
#define nsTraceRefcntImpl_h___
#ifndef nsTraceRefcnt_h___
#define nsTraceRefcnt_h___
#include <stdio.h> // for FILE
#include "nscore.h"
class nsTraceRefcntImpl
class nsTraceRefcnt
{
public:
static void Startup();

2
xpcom/build/PoisonIOInterposerMac.cpp
View File

@ -17,7 +17,7 @@
#include "mozilla/Telemetry.h"
#include "nsPrintfCString.h"
#include "nsStackWalk.h"
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#include "plstr.h"
#include "prio.h"

2
xpcom/build/nsXPComInit.cpp
View File

@ -29,7 +29,7 @@
#include "nsMemoryImpl.h"
#include "nsDebugImpl.h"
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#include "nsErrorService.h"
#include "nsSupportsArray.h"

6
xpcom/components/nsNativeComponentLoader.cpp
View File

@ -29,7 +29,7 @@
#include "ManifestParser.h" // for LogMessage
#include "nsCRTGlue.h"
#include "nsThreadUtils.h"
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#include "nsIFile.h"
#include "mozilla/WindowsDllBlocklist.h"
@ -220,7 +220,7 @@ nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
}
#ifdef NS_BUILD_REFCNT_LOGGING
nsTraceRefcntImpl::SetActivityIsLegal(false);
nsTraceRefcnt::SetActivityIsLegal(false);
#endif
#if 0
@ -231,7 +231,7 @@ nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile,
#endif
#ifdef NS_BUILD_REFCNT_LOGGING
nsTraceRefcntImpl::SetActivityIsLegal(true);
nsTraceRefcnt::SetActivityIsLegal(true);
#endif
return PL_DHASH_REMOVE;

6
xpcom/io/nsLocalFileUnix.cpp
View File

@ -70,7 +70,7 @@ static nsresult MacErrorMapper(OSErr inErr);
#endif
#include "nsNativeCharsetUtils.h"
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#include "nsHashKeys.h"
using namespace mozilla;
@ -1737,13 +1737,13 @@ nsLocalFile::Load(PRLibrary **_retval)
return NS_ERROR_INVALID_ARG;
#ifdef NS_BUILD_REFCNT_LOGGING
nsTraceRefcntImpl::SetActivityIsLegal(false);
nsTraceRefcnt::SetActivityIsLegal(false);
#endif
*_retval = PR_LoadLibrary(mPath.get());
#ifdef NS_BUILD_REFCNT_LOGGING
nsTraceRefcntImpl::SetActivityIsLegal(true);
nsTraceRefcnt::SetActivityIsLegal(true);
#endif
if (!*_retval)

6
xpcom/io/nsLocalFileWin.cpp
View File

@ -46,7 +46,7 @@
#include "mozilla/Mutex.h"
#include "SpecialSystemDirectory.h"
#include "nsTraceRefcntImpl.h"
#include "nsTraceRefcnt.h"
#include "nsXPCOMCIDInternal.h"
#include "nsThreadUtils.h"
#include "nsXULAppAPI.h"
@ -2226,7 +2226,7 @@ nsLocalFile::Load(PRLibrary * *_retval)
return NS_ERROR_FILE_IS_DIRECTORY;
#ifdef NS_BUILD_REFCNT_LOGGING
nsTraceRefcntImpl::SetActivityIsLegal(false);
nsTraceRefcnt::SetActivityIsLegal(false);
#endif
PRLibSpec libSpec;
@ -2235,7 +2235,7 @@ nsLocalFile::Load(PRLibrary * *_retval)
*_retval = PR_LoadLibraryWithFlags(libSpec, 0);
#ifdef NS_BUILD_REFCNT_LOGGING
nsTraceRefcntImpl::SetActivityIsLegal(true);
nsTraceRefcnt::SetActivityIsLegal(true);
#endif
if (*_retval)

4
xpcom/tests/TestStackCrawl.cpp
View File

@ -1,11 +1,11 @@
#include <stdio.h>
#include "nsISupportsUtils.h"
#include "nsTraceRefCntImpl.h"
#include "nsTraceRefcnt.h"
int main(int argc, char* argv[])
{
nsTraceRefcntImpl::WalkTheStack(stdout);
nsTraceRefcnt::WalkTheStack(stdout);
return 0;
}