Bug 937157, part 2 - Remove flushing debug info plus a few other minor things. r=bholley

This commit is contained in:
Andrew McCreight 2013-11-17 14:46:58 -08:00
parent 11c210233b
commit 36d73a2e1c
3 changed files with 0 additions and 58 deletions

View File

@ -100,12 +100,6 @@ NativeInterfaceSweeper(PLDHashTable *table, PLDHashEntryHdr *hdr,
if (arg == UNMARK_ONLY)
return PL_DHASH_NEXT;
#ifdef XPC_REPORT_NATIVE_INTERFACE_AND_SET_FLUSHING
fputs("- Destroying XPCNativeInterface for ", stdout);
JS_PutString(JSVAL_TO_STRING(iface->GetName()), stdout);
putc('\n', stdout);
#endif
XPCNativeInterface::DestroyInstance(iface);
return PL_DHASH_REMOVE;
}
@ -138,17 +132,6 @@ NativeSetSweeper(PLDHashTable *table, PLDHashEntryHdr *hdr,
if (arg == UNMARK_ONLY)
return PL_DHASH_NEXT;
#ifdef XPC_REPORT_NATIVE_INTERFACE_AND_SET_FLUSHING
printf("- Destroying XPCNativeSet for:\n");
uint16_t count = set->GetInterfaceCount();
for (uint16_t k = 0; k < count; k++) {
XPCNativeInterface* iface = set->GetInterfaceAt(k);
fputs(" ", stdout);
JS_PutString(JSVAL_TO_STRING(iface->GetName()), stdout);
putc('\n', stdout);
}
#endif
XPCNativeSet::DestroyInstance(set);
return PL_DHASH_REMOVE;
}
@ -160,11 +143,6 @@ JSClassSweeper(PLDHashTable *table, PLDHashEntryHdr *hdr,
XPCNativeScriptableShared* shared =
((XPCNativeScriptableSharedMap::Entry*) hdr)->key;
if (shared->IsMarked()) {
#ifdef off_XPC_REPORT_JSCLASS_FLUSHING
printf("+ Marked XPCNativeScriptableShared for: %s @ %x\n",
shared->GetJSClass()->name,
shared->GetJSClass());
#endif
shared->Unmark();
return PL_DHASH_NEXT;
}
@ -172,12 +150,6 @@ JSClassSweeper(PLDHashTable *table, PLDHashEntryHdr *hdr,
if (arg == UNMARK_ONLY)
return PL_DHASH_NEXT;
#ifdef XPC_REPORT_JSCLASS_FLUSHING
printf("- Destroying XPCNativeScriptableShared for: %s @ %x\n",
shared->GetJSClass()->name,
shared->GetJSClass());
#endif
delete shared;
return PL_DHASH_REMOVE;
}
@ -877,12 +849,6 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, bool isCo
self->mThreadRunningGC = PR_GetCurrentThread();
}
#ifdef XPC_REPORT_NATIVE_INTERFACE_AND_SET_FLUSHING
printf("--------------------------------------------------------------\n");
int setsBefore = (int) self->mNativeSetMap->Count();
int ifacesBefore = (int) self->mIID2NativeInterfaceMap->Count();
#endif
// We use this occasion to mark and sweep NativeInterfaces,
// NativeSets, and the WrappedNativeJSClasses...
@ -965,18 +931,6 @@ XPCJSRuntime::FinalizeCallback(JSFreeOp *fop, JSFinalizeStatus status, bool isCo
XPCWrappedNativeScope::ASSERT_NoInterfaceSetsAreMarked();
#endif
#ifdef XPC_REPORT_NATIVE_INTERFACE_AND_SET_FLUSHING
int setsAfter = (int) self->mNativeSetMap->Count();
int ifacesAfter = (int) self->mIID2NativeInterfaceMap->Count();
printf("\n");
printf("XPCNativeSets: before: %d collected: %d remaining: %d\n",
setsBefore, setsBefore - setsAfter, setsAfter);
printf("XPCNativeInterfaces: before: %d collected: %d remaining: %d\n",
ifacesBefore, ifacesBefore - ifacesAfter, ifacesAfter);
printf("--------------------------------------------------------------\n");
#endif
// Now we are going to recycle any unused WrappedNativeTearoffs.
// We do this by iterating all the live callcontexts
// and marking the tearoffs in use. And then we

View File

@ -1238,12 +1238,10 @@ NS_IMPL_ISUPPORTS1(nsXPCFunctionThisTranslator, nsIXPCFunctionThisTranslator)
nsXPCFunctionThisTranslator::nsXPCFunctionThisTranslator()
{
/* member initializers and constructor code */
}
nsXPCFunctionThisTranslator::~nsXPCFunctionThisTranslator()
{
/* destructor code */
}
/* nsISupports TranslateThis (in nsISupports aInitialThis); */

View File

@ -178,10 +178,6 @@
// Note that one would not normally turn *any* of these on in a non-DEBUG build.
#if defined(DEBUG_jst) || defined(DEBUG_timeless)
#define DEBUG_xpc_hacker
#endif
#if defined(DEBUG_xpc_hacker)
#define XPC_DUMP_AT_SHUTDOWN
#define XPC_TRACK_WRAPPER_STATS
@ -193,12 +189,6 @@
#if defined(DEBUG_jst)
#define XPC_ASSERT_CLASSINFO_CLAIMS
#endif
//#define XPC_REPORT_NATIVE_INTERFACE_AND_SET_FLUSHING
//#define XPC_REPORT_JSCLASS_FLUSHING
#endif
#if defined(DEBUG_dbaron) || defined(DEBUG_bzbarsky) // only part of DEBUG_xpc_hacker!
#define XPC_DUMP_AT_SHUTDOWN
#endif
/***************************************************************************/