Permalink
Browse files

Bug 579571 - Remove --enable-timeline support. r=tglek

  • Loading branch information...
1 parent 150c875 commit 87b29e12cdbfdf41af79e52d8a854d95b353f924 Matheus Kerschbaum committed Jul 17, 2011
Showing with 1 addition and 1,530 deletions.
  1. +0 −1 config/autoconf.mk.in
  2. +0 −15 configure.in
  3. +0 −2 content/xul/content/src/nsXULElement.cpp
  4. +0 −3 dom/base/nsJSEnvironment.cpp
  5. +0 −9 dom/plugins/base/nsPluginHost.cpp
  6. +0 −1 embedding/components/find/src/nsWebBrowserFind.cpp
  7. +0 −5 intl/locale/src/nsCharsetAliasImp.cpp
  8. +1 −6 intl/locale/src/os2/nsOS2Charset.cpp
  9. +0 −6 intl/locale/src/windows/nsWinCharset.cpp
  10. +0 −3 intl/strres/src/nsStringBundle.cpp
  11. +0 −1 js/src/config/autoconf.mk.in
  12. +0 −14 js/src/configure.in
  13. +0 −17 layout/base/nsDocumentViewer.cpp
  14. +0 −1 layout/printing/nsPagePrintTimer.h
  15. +0 −11 layout/style/Loader.cpp
  16. +0 −8 layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
  17. +0 −10 modules/libpref/src/Preferences.cpp
  18. +0 −2 netwerk/base/src/nsIOService.cpp
  19. +0 −5 rdf/base/src/nsRDFXMLDataSource.cpp
  20. +0 −5 rdf/base/src/nsRDFXMLSerializer.cpp
  21. +0 −72 toolkit/components/intl/nsCharsetMenu.cpp
  22. +0 −1 toolkit/components/startup/nsAppStartup.cpp
  23. +0 −13 toolkit/xre/nsAppRunner.cpp
  24. +0 −259 tools/performance/startup/analyze-timeline-log.pl
  25. +0 −88 tools/performance/startup/measure-simple.pl
  26. +0 −57 tools/performance/startup/printlog.pl
  27. +0 −1 xpcom/build/XPCOM.h
  28. +0 −3 xpcom/build/XPCOMModule.inc
  29. +0 −5 xpcom/build/nsXPComInit.cpp
  30. +0 −2 xpcom/ds/Makefile.in
  31. +0 −242 xpcom/ds/nsITimelineService.idl
  32. +0 −574 xpcom/ds/nsTimelineService.cpp
  33. +0 −64 xpcom/ds/nsTimelineService.h
  34. +0 −6 xpcom/io/nsLocalFileUnix.cpp
  35. +0 −7 xpcom/io/nsLocalFileWin.cpp
  36. +0 −1 xpfe/appshell/src/nsAppShellService.cpp
  37. +0 −10 xpfe/appshell/src/nsXULWindow.cpp
View
@@ -209,7 +209,6 @@ MOZ_FIX_LINK_PATHS=@MOZ_FIX_LINK_PATHS@
XPCOM_FROZEN_LDOPTS=@XPCOM_FROZEN_LDOPTS@
XPCOM_LIBS=@XPCOM_LIBS@
LIBXUL_LIBS=@LIBXUL_LIBS@
-MOZ_TIMELINE=@MOZ_TIMELINE@
ENABLE_STRIP = @ENABLE_STRIP@
PKG_SKIP_STRIP = @PKG_SKIP_STRIP@
View
@@ -4817,7 +4817,6 @@ MOZ_SPELLCHECK=1
MOZ_SPLASHSCREEN=
MOZ_STORAGE=1
MOZ_SVG_DLISTS=
-MOZ_TIMELINE=
MOZ_TOOLKIT_SEARCH=1
MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1
@@ -7748,19 +7747,6 @@ dnl =
dnl ========================================================
MOZ_ARG_HEADER(Profiling and Instrumenting)
-dnl ========================================================
-dnl = Enable timeline service, which provides lightweight
-dnl = instrumentation of mozilla for performance measurement.
-dnl = Timeline is off by default.
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(timeline,
-[ --enable-timeline Enable timeline services ],
- MOZ_TIMELINE=1,
- MOZ_TIMELINE= )
-if test -n "$MOZ_TIMELINE"; then
- AC_DEFINE(MOZ_TIMELINE)
-fi
-
dnl ========================================================
dnl = Enable NS_FUNCTION_TIMER, which provides Function
dnl = timing for identifying code bottlenecks
@@ -8979,7 +8965,6 @@ AC_SUBST(MOZ_OS2_TOOLS)
AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
-AC_SUBST(MOZ_TIMELINE)
# The following variables are available to branding and application
# configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh):
@@ -138,7 +138,6 @@
#include "nsIDOMXULDocument.h"
#include "nsReadableUtils.h"
-#include "nsITimelineService.h"
#include "nsIFrame.h"
#include "nsNodeInfoManager.h"
#include "nsXBLBinding.h"
@@ -3002,7 +3001,6 @@ nsXULPrototypeScript::Deserialize(nsIObjectInputStream* aStream,
nsIURI* aDocumentURI,
const nsCOMArray<nsINodeInfo> *aNodeInfos)
{
- NS_TIMELINE_MARK_FUNCTION("chrome script deserialize");
nsresult rv;
NS_ASSERTION(!mSrcLoading || mSrcLoadWaiters != nsnull ||
@@ -93,7 +93,6 @@
#include "nsIArray.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
-#include "nsITimelineService.h"
#include "nsDOMScriptObjectHolder.h"
#include "prmem.h"
#include "WrapperFactory.h"
@@ -2100,8 +2099,6 @@ nsJSContext::Deserialize(nsIObjectInputStream* aStream,
NS_TIME_FUNCTION_MIN(1.0);
- NS_TIMELINE_MARK_FUNCTION("js script deserialize");
-
PRUint32 size;
rv = aStream->Read32(&size);
if (NS_FAILED(rv)) return rv;
@@ -2273,18 +2273,12 @@ nsresult nsPluginHost::LoadPlugins()
return NS_OK;
}
-#include "nsITimelineService.h"
-
// if aCreatePluginList is false we will just scan for plugins
// and see if any changes have been made to the plugins.
// This is needed in ReloadPlugins to prevent possible recursive reloads
nsresult nsPluginHost::FindPlugins(PRBool aCreatePluginList, PRBool * aPluginsChanged)
{
Telemetry::AutoTimer<Telemetry::FIND_PLUGINS> telemetry;
- // let's start timing if we are only really creating the plugin list
- if (aCreatePluginList) {
- NS_TIMELINE_START_TIMER("LoadPlugins");
- }
#ifdef CALL_SAFETY_ON
// check preferences on whether or not we want to try safe calls to plugins
@@ -2459,9 +2453,6 @@ nsresult nsPluginHost::FindPlugins(PRBool aCreatePluginList, PRBool * aPluginsCh
NS_ITERATIVE_UNREF_LIST(nsRefPtr<nsPluginTag>, mCachedPlugins, mNext);
NS_ITERATIVE_UNREF_LIST(nsRefPtr<nsInvalidPluginTag>, mInvalidPlugins, mNext);
- NS_TIMELINE_STOP_TIMER("LoadPlugins");
- NS_TIMELINE_MARK_TIMER("LoadPlugins");
-
return NS_OK;
}
@@ -70,7 +70,6 @@
#include "nsIServiceManager.h"
#include "nsIObserverService.h"
#include "nsISupportsPrimitives.h"
-#include "nsITimelineService.h"
#include "nsFind.h"
#include "nsDOMError.h"
#include "nsFocusManager.h"
@@ -45,7 +45,6 @@
#include "nsReadableUtils.h"
#include "nsUnicharUtils.h"
#include "nsUConvPropertySearch.h"
-#include "nsITimelineService.h"
#include "nsCharsetAlias.h"
//--------------------------------------------------------------
@@ -71,16 +70,12 @@ NS_IMETHODIMP nsCharsetAlias2::GetPreferred(const nsACString& aAlias,
{
if (aAlias.IsEmpty()) return NS_ERROR_NULL_POINTER;
- NS_TIMELINE_START_TIMER("nsCharsetAlias2:GetPreferred");
-
nsCAutoString key(aAlias);
ToLowerCase(key);
nsresult rv = nsUConvPropertySearch::SearchPropertyValue(kAliases,
NS_ARRAY_LENGTH(kAliases), key, oResult);
- NS_TIMELINE_STOP_TIMER("nsCharsetAlias2:GetPreferred");
- NS_TIMELINE_MARK_TIMER("nsCharsetAlias2:GetPreferred");
return rv;
}
@@ -48,7 +48,6 @@
#include "nsReadableUtils.h"
#include "nsLocaleCID.h"
#include "nsIServiceManager.h"
-#include "nsITimelineService.h"
#include "nsPlatformCharset.h"
static const char* kOS2Charsets[][3] = {
@@ -59,17 +58,13 @@ NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset)
nsPlatformCharset::nsPlatformCharset()
{
- NS_TIMELINE_START_TIMER("nsPlatformCharset()");
-
UINT acp = ::WinQueryCp(HMQ_CURRENT);
PRInt32 acpint = (PRInt32)(acp & 0x00FFFF);
nsAutoString acpKey(NS_LITERAL_STRING("os2."));
acpKey.AppendInt(acpint, 10);
nsresult res = MapToCharset(acpKey, mCharset);
+}
- NS_TIMELINE_STOP_TIMER("nsPlatformCharset()");
- NS_TIMELINE_MARK_TIMER("nsPlatformCharset()");
- }
nsPlatformCharset::~nsPlatformCharset()
{
}
@@ -44,7 +44,6 @@
#include "nsReadableUtils.h"
#include "nsLocaleCID.h"
#include "nsServiceManagerUtils.h"
-#include "nsITimelineService.h"
#include "nsPlatformCharset.h"
#include "nsEncoderDecoderUtils.h"
@@ -56,14 +55,9 @@ NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset)
nsPlatformCharset::nsPlatformCharset()
{
- NS_TIMELINE_START_TIMER("nsPlatformCharset()");
-
nsAutoString acpKey(NS_LITERAL_STRING("acp."));
acpKey.AppendInt(PRInt32(::GetACP() & 0x00FFFF), 10);
MapToCharset(acpKey, mCharset);
-
- NS_TIMELINE_STOP_TIMER("nsPlatformCharset()");
- NS_TIMELINE_MARK_TIMER("nsPlatformCharset()");
}
nsPlatformCharset::~nsPlatformCharset()
@@ -61,7 +61,6 @@
#include "nsCOMArray.h"
#include "nsTextFormatter.h"
#include "nsIErrorService.h"
-#include "nsITimelineService.h"
#include "nsICategoryManager.h"
#include "nsPrintfCString.h"
@@ -128,8 +127,6 @@ nsStringBundle::LoadProperties()
rv = channel->Open(getter_AddRefs(in));
if (NS_FAILED(rv)) return rv;
- NS_TIMELINE_MARK_FUNCTION("loading properties");
-
NS_ASSERTION(NS_SUCCEEDED(rv) && in, "Error in OpenBlockingStream");
NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && in, NS_ERROR_FAILURE);
@@ -115,7 +115,6 @@ MOZ_FIX_LINK_PATHS=@MOZ_FIX_LINK_PATHS@
XPCOM_FROZEN_LDOPTS=@XPCOM_FROZEN_LDOPTS@
XPCOM_LIBS=@XPCOM_LIBS@
-MOZ_TIMELINE=@MOZ_TIMELINE@
ENABLE_STRIP = @ENABLE_STRIP@
PKG_SKIP_STRIP = @PKG_SKIP_STRIP@
View
@@ -5128,19 +5128,6 @@ dnl =
dnl ========================================================
MOZ_ARG_HEADER(Profiling and Instrumenting)
-dnl ========================================================
-dnl = Enable timeline service, which provides lightweight
-dnl = instrumentation of mozilla for performance measurement.
-dnl = Timeline is off by default.
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(timeline,
-[ --enable-timeline Enable timeline services ],
- MOZ_TIMELINE=1,
- MOZ_TIMELINE= )
-if test -n "$MOZ_TIMELINE"; then
- AC_DEFINE(MOZ_TIMELINE)
-fi
-
dnl ========================================================
dnl = Support for Quantify (Windows)
dnl ========================================================
@@ -5677,7 +5664,6 @@ AC_SUBST(MOZ_OS2_TOOLS)
AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
-AC_SUBST(MOZ_TIMELINE)
AC_SUBST(MOZ_APP_NAME)
AC_SUBST(MOZ_APP_DISPLAYNAME)
@@ -122,7 +122,6 @@
#include "nsIScrollableFrame.h"
#include "nsIHTMLDocument.h"
-#include "nsITimelineService.h"
#include "nsGfxCIID.h"
#include "nsStyleSheetService.h"
#include "nsURILoader.h"
@@ -1068,22 +1067,6 @@ DocumentViewerImpl::LoadComplete(nsresult aStatus)
if (timing) {
timing->NotifyLoadEventEnd();
}
-#ifdef MOZ_TIMELINE
- // if navigator.xul's load is complete, the main nav window is visible
- // mark that point.
-
- nsIURI *uri = mDocument ? mDocument->GetDocumentURI() : nsnull;
-
- if (uri) {
- //printf("DEBUG: getting spec for uri (%p)\n", uri.get());
- nsCAutoString spec;
- uri->GetSpec(spec);
- if (spec.EqualsLiteral("chrome://navigator/content/navigator.xul") ||
- spec.EqualsLiteral("chrome://browser/content/browser.xul")) {
- NS_TIMELINE_MARK("Navigator Window visible now");
- }
- }
-#endif /* MOZ_TIMELINE */
}
} else {
// XXX: Should fire error event to the document...
@@ -39,7 +39,6 @@
// Timer Includes
#include "nsITimer.h"
-#include "nsITimelineService.h"
#include "nsIDocumentViewerPrint.h"
#include "nsPrintObject.h"
View
@@ -69,7 +69,6 @@
#include "nsCRT.h"
#include "nsIScriptSecurityManager.h"
#include "nsContentPolicyUtils.h"
-#include "nsITimelineService.h"
#include "nsIHttpChannel.h"
#include "nsIScriptError.h"
#include "nsMimeTypes.h"
@@ -816,11 +815,6 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
mSheet->SetPrincipal(principal);
-#ifdef MOZ_TIMELINE
- NS_TIMELINE_OUTDENT();
- NS_TIMELINE_MARK_CHANNEL("SheetLoadData::OnStreamComplete(%s)", channel);
-#endif // MOZ_TIMELINE
-
// If it's an HTTP channel, we want to make sure this is not an
// error document we got.
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));
@@ -1441,11 +1435,6 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
}
}
-#ifdef MOZ_TIMELINE
- NS_TIMELINE_MARK_URI("Loading style sheet: %s", aLoadData->mURI);
- NS_TIMELINE_INDENT();
-#endif
-
nsCOMPtr<nsIChannel> channel;
rv = NS_NewChannel(getter_AddRefs(channel),
aLoadData->mURI, nsnull, loadGroup, nsnull,
@@ -90,7 +90,6 @@
#include "nsTreeUtils.h"
#include "nsChildIterator.h"
#include "nsITheme.h"
-#include "nsITimelineService.h"
#include "imgIRequest.h"
#include "imgIContainer.h"
#include "imgIContainerObserver.h"
@@ -3616,9 +3615,6 @@ nsTreeBodyFrame::PaintText(PRInt32 aRowIndex,
fontMet->GetStrikeout(offset, size);
aRenderingContext.FillRect(textRect.x, textRect.y + baseline - offset, textRect.width, size);
}
-#ifdef MOZ_TIMELINE
- NS_TIMELINE_START_TIMER("Render Outline Text");
-#endif
PRUint8 direction = aTextRTL ? NS_STYLE_DIRECTION_RTL :
NS_STYLE_DIRECTION_LTR;
@@ -3635,10 +3631,6 @@ nsTreeBodyFrame::PaintText(PRInt32 aRowIndex,
ctx->Paint(opacity);
}
-#ifdef MOZ_TIMELINE
- NS_TIMELINE_STOP_TIMER("Render Outline Text");
- NS_TIMELINE_MARK_TIMER("Render Outline Text");
-#endif
}
void
@@ -68,8 +68,6 @@
#include "prefapi_private_data.h"
#include "PrefTuple.h"
-#include "nsITimelineService.h"
-
#include "mozilla/Omnijar.h"
#include "nsZipArchive.h"
@@ -811,14 +809,6 @@ static nsresult openPrefFile(nsIFile* aFile)
{
nsCOMPtr<nsIInputStream> inStr;
-#if MOZ_TIMELINE
- {
- nsCAutoString str;
- aFile->GetNativePath(str);
- NS_TIMELINE_MARK_FUNCTION1("load pref file", str.get());
- }
-#endif
-
nsresult rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), aFile);
if (NS_FAILED(rv))
return rv;
@@ -61,7 +61,6 @@
#include "nsISupportsPrimitives.h"
#include "nsIProxiedProtocolHandler.h"
#include "nsIProxyInfo.h"
-#include "nsITimelineService.h"
#include "nsEscape.h"
#include "nsNetCID.h"
#include "nsIRecyclingAllocator.h"
@@ -605,7 +604,6 @@ nsIOService::NewChannelFromURIWithProxyFlags(nsIURI *aURI,
{
nsresult rv;
NS_ENSURE_ARG_POINTER(aURI);
- NS_TIMELINE_MARK_URI("nsIOService::NewChannelFromURI(%s)", aURI);
nsCAutoString scheme;
rv = aURI->GetScheme(scheme);
Oops, something went wrong.

0 comments on commit 87b29e1

Please sign in to comment.