Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bug 851611 - Part 3: Rename headers. r=jrmuizel

--HG--
rename : tools/profiler/sampler.h => tools/profiler/GeckoProfiler.h
rename : tools/profiler/sps_sampler.h => tools/profiler/GeckoProfilerImpl.h
extra : rebase_source : 6ea7c660764a4390cdd8dd91561fff1d7bad6035
  • Loading branch information...
commit b9db4c1b228847d722f9d185884c713218488bb0 1 parent 30767e3
@bgirard bgirard authored
Showing with 80 additions and 80 deletions.
  1. +1 −1  content/base/src/nsFrameLoader.cpp
  2. +1 −1  content/base/src/nsObjectLoadingContent.cpp
  3. +1 −1  content/base/src/nsXMLHttpRequest.cpp
  4. +1 −1  content/events/src/nsEventDispatcher.cpp
  5. +1 −1  content/events/src/nsEventStateManager.cpp
  6. +1 −1  content/html/content/src/nsGenericHTMLFrameElement.cpp
  7. +1 −1  content/html/document/src/PluginDocument.cpp
  8. +1 −1  dom/base/nsDOMWindowUtils.cpp
  9. +1 −1  dom/base/nsJSEnvironment.cpp
  10. +1 −1  dom/plugins/base/nsPluginStreamListenerPeer.cpp
  11. +1 −1  dom/plugins/ipc/PluginModuleParent.cpp
  12. +1 −1  dom/src/storage/StorageChild.cpp
  13. +1 −1  dom/src/storage/nsDOMStoragePersistentDB.cpp
  14. +1 −1  gfx/gl/GLContextProviderCGL.mm
  15. +1 −1  gfx/layers/ThebesLayerBuffer.cpp
  16. +1 −1  gfx/layers/basic/BasicLayerManager.cpp
  17. +1 −1  gfx/layers/basic/BasicThebesLayer.cpp
  18. +1 −1  gfx/layers/basic/BasicTiledThebesLayer.cpp
  19. +1 −1  gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
  20. +1 −1  gfx/layers/ipc/ShadowLayers.cpp
  21. +1 −1  gfx/layers/opengl/LayerManagerOGL.cpp
  22. +1 −1  gfx/thebes/gfxContext.cpp
  23. +1 −1  gfx/thebes/gfxFont.cpp
  24. +1 −1  gfx/thebes/gfxUtils.cpp
  25. +1 −1  image/src/Decoder.cpp
  26. +1 −1  image/src/RasterImage.cpp
  27. +1 −1  image/src/imgFrame.cpp
  28. +1 −1  js/xpconnect/src/XPCJSRuntime.cpp
  29. +1 −1  layout/base/FrameLayerBuilder.cpp
  30. +1 −1  layout/base/RestyleTracker.cpp
  31. +1 −1  layout/base/nsCSSFrameConstructor.cpp
  32. +1 −1  layout/base/nsCSSRendering.cpp
  33. +1 −1  layout/base/nsCSSRenderingBorders.cpp
  34. +1 −1  layout/base/nsDisplayList.cpp
  35. +1 −1  layout/base/nsFrameManager.cpp
  36. +1 −1  layout/base/nsLayoutUtils.cpp
  37. +1 −1  layout/base/nsPresShell.cpp
  38. +1 −1  layout/base/nsRefreshDriver.cpp
  39. +1 −1  layout/generic/nsObjectFrame.cpp
  40. +1 −1  layout/generic/nsTextFrameThebes.cpp
  41. +1 −1  layout/generic/nsViewportFrame.cpp
  42. +1 −1  layout/style/nsStyleContext.cpp
  43. +1 −1  layout/style/nsStyleSet.cpp
  44. +1 −1  netwerk/base/src/nsInputStreamPump.cpp
  45. +1 −1  netwerk/base/src/nsStreamLoader.cpp
  46. +1 −1  netwerk/protocol/http/nsHttpChannel.cpp
  47. +1 −1  parser/html/nsHtml5TreeOpExecutor.cpp
  48. +1 −1  storage/src/mozStorageConnection.cpp
  49. +1 −1  storage/src/mozStorageStatement.cpp
  50. +1 −1  toolkit/components/places/nsAnnotationService.cpp
  51. +1 −1  toolkit/components/places/nsNavBookmarks.cpp
  52. +1 −1  toolkit/components/startup/StartupTimeline.h
  53. +1 −1  toolkit/components/startup/nsAppStartup.cpp
  54. +2 −2 toolkit/xre/EventTracer.cpp
  55. +1 −1  toolkit/xre/nsAppRunner.cpp
  56. +1 −1  toolkit/xre/nsEmbedFunctions.cpp
  57. +1 −1  tools/profiler/{sampler.h → GeckoProfiler.h}
  58. +2 −2 tools/profiler/{sps_sampler.h → GeckoProfilerImpl.h}
  59. +2 −2 tools/profiler/Makefile.in
  60. +1 −1  tools/profiler/ProfileEntry2.cpp
  61. +1 −0  tools/profiler/ProfileEntry2.h
  62. +1 −1  tools/profiler/TableTicker.cpp
  63. +3 −3 tools/profiler/TableTicker2.cpp
  64. +1 −2  tools/profiler/UnwinderThread2.cpp
  65. +1 −1  tools/profiler/UnwinderThread2.h
  66. +1 −1  tools/profiler/nsProfiler.cpp
  67. +1 −1  tools/profiler/platform-linux.cc
  68. +1 −1  view/src/nsViewManager.cpp
  69. +1 −1  widget/android/nsAppShell.cpp
  70. +1 −1  widget/cocoa/nsAppShell.mm
  71. +1 −1  widget/cocoa/nsChildView.mm
  72. +1 −1  widget/gonk/nsAppShell.cpp
  73. +1 −1  xpcom/base/nsCycleCollector.cpp
  74. +1 −1  xpcom/build/nsXPComInit.cpp
  75. +1 −1  xpcom/threads/nsTimerImpl.cpp
View
2  content/base/src/nsFrameLoader.cpp
@@ -83,7 +83,7 @@
#include "mozilla/dom/Element.h"
#include "mozilla/layout/RenderFrameParent.h"
#include "nsIAppsService.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "jsapi.h"
#include "mozilla/dom/HTMLIFrameElement.h"
View
2  content/base/src/nsObjectLoadingContent.cpp
@@ -67,7 +67,7 @@
#include "nsIChannelPolicy.h"
#include "nsChannelPolicy.h"
#include "mozilla/dom/Element.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsObjectFrame.h"
#include "nsDOMClassInfo.h"
#include "nsWrapperCacheInlines.h"
View
2  content/base/src/nsXMLHttpRequest.cpp
@@ -69,7 +69,7 @@
#include "nsIFileChannel.h"
#include "mozilla/Telemetry.h"
#include "jsfriendapi.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "mozilla/dom/EncodingUtils.h"
#include "mozilla/dom/XMLHttpRequestBinding.h"
#include "nsIDOMFormData.h"
View
2  content/events/src/nsEventDispatcher.cpp
@@ -18,7 +18,7 @@
#include "nsFrameLoader.h"
#include "nsDOMTouchEvent.h"
#include "nsDOMStorage.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "GeneratedEvents.h"
using namespace mozilla;
View
2  content/events/src/nsEventStateManager.cpp
@@ -95,7 +95,7 @@
#include "mozilla/Preferences.h"
#include "mozilla/LookAndFeel.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsIDOMClientRect.h"
View
2  content/html/content/src/nsGenericHTMLFrameElement.cpp
@@ -14,7 +14,7 @@
#include "nsServiceManagerUtils.h"
#include "nsIDOMApplicationRegistry.h"
#include "nsIPermissionManager.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace mozilla;
using namespace mozilla::dom;
View
2  content/html/document/src/PluginDocument.cpp
@@ -17,7 +17,7 @@
#include "nsIPropertyBag2.h"
#include "mozilla/dom/Element.h"
#include "nsObjectLoadingContent.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
namespace mozilla {
namespace dom {
View
2  dom/base/nsDOMWindowUtils.cpp
@@ -63,7 +63,7 @@
#include "mozilla/dom/Element.h"
#include "mozilla/dom/indexedDB/FileInfo.h"
#include "mozilla/dom/indexedDB/IndexedDatabaseManager.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsDOMBlobBuilder.h"
#include "nsIDOMFileHandle.h"
#include "nsPrintfCString.h"
View
2  dom/base/nsJSEnvironment.cpp
@@ -81,7 +81,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/dom/CanvasRenderingContext2DBinding.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace mozilla;
using namespace mozilla::dom;
View
2  dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -25,7 +25,7 @@
#include "nsContentUtils.h"
#include "nsNetUtil.h"
#include "nsPluginNativeWindow.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsPluginInstanceOwner.h"
#define MAGIC_REQUEST_CONTEXT 0x01020304
View
2  dom/plugins/ipc/PluginModuleParent.cpp
@@ -38,7 +38,7 @@
#include "PluginHangUIParent.h"
#include "mozilla/widget/AudioSession.h"
#endif
-#include "sampler.h"
+#include "GeckoProfiler.h"
using base::KillProcess;
View
2  dom/src/storage/StorageChild.cpp
@@ -8,7 +8,7 @@
#include "mozilla/dom/ContentChild.h"
#include "nsError.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
namespace mozilla {
namespace dom {
View
2  dom/src/storage/nsDOMStoragePersistentDB.cpp
@@ -24,7 +24,7 @@
#include "mozilla/Telemetry.h"
#include "nsThreadUtils.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace mozilla;
View
2  gfx/gl/GLContextProviderCGL.mm
@@ -16,7 +16,7 @@
#include "gfxFailure.h"
#include "prenv.h"
#include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace mozilla::gfx;
View
2  gfx/layers/ThebesLayerBuffer.cpp
@@ -12,7 +12,7 @@
#include "gfxUtils.h"
#include "ipc/AutoOpenSurface.h"
#include "nsDeviceContext.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include <algorithm>
namespace mozilla {
View
2  gfx/layers/basic/BasicLayerManager.cpp
@@ -15,7 +15,7 @@
#include "gfxPlatform.h"
#include "nsXULAppAPI.h"
#include "RenderTrace.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#define PIXMAN_DONT_DEFINE_STDINT
#include "pixman.h"
View
2  gfx/layers/basic/BasicThebesLayer.cpp
@@ -7,7 +7,7 @@
#include "gfxUtils.h"
#include "nsIWidget.h"
#include "RenderTrace.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "prprf.h"
View
2  gfx/layers/basic/BasicTiledThebesLayer.cpp
@@ -6,7 +6,7 @@
#include "mozilla/MathAlgorithms.h"
#include "BasicTiledThebesLayer.h"
#include "gfxImageSurface.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "gfxPlatform.h"
#ifdef GFX_TILEDLAYER_DEBUG_OVERLAY
View
2  gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
@@ -21,7 +21,7 @@
#include "gfxImageSurface.h"
#include "gfxPlatform.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace android;
using namespace base;
View
2  gfx/layers/ipc/ShadowLayers.cpp
@@ -20,7 +20,7 @@
#include "ShadowLayerChild.h"
#include "gfxipc/ShadowLayerUtils.h"
#include "RenderTrace.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsXULAppAPI.h"
using namespace mozilla::ipc;
View
2  gfx/layers/opengl/LayerManagerOGL.cpp
@@ -35,7 +35,7 @@
#include "gfxCrashReporterUtils.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef MOZ_WIDGET_ANDROID
#include <android/log.h>
View
2  gfx/thebes/gfxContext.cpp
@@ -20,7 +20,7 @@
#include "gfxPattern.h"
#include "gfxPlatform.h"
#include "gfxTeeSurface.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include <algorithm>
#if CAIRO_HAS_DWRITE_FONT
View
2  gfx/thebes/gfxFont.cpp
@@ -46,7 +46,7 @@
#include "harfbuzz/hb.h"
#include "nsCRT.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include <algorithm>
View
2  gfx/thebes/gfxUtils.cpp
@@ -10,7 +10,7 @@
#include "nsRegion.h"
#include "yuv_convert.h"
#include "ycbcr_to_rgb565.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef XP_WIN
#include "gfxWindowsPlatform.h"
View
2  image/src/Decoder.cpp
@@ -8,7 +8,7 @@
#include "nsIServiceManager.h"
#include "nsIConsoleService.h"
#include "nsIScriptError.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
namespace mozilla {
namespace image {
View
2  image/src/RasterImage.cpp
@@ -43,7 +43,7 @@
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/gfx/Scale.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include <algorithm>
using namespace mozilla;
View
2  image/src/imgFrame.cpp
@@ -17,7 +17,7 @@
static bool gDisableOptimize = false;
#include "cairo.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "mozilla/Likely.h"
#if defined(XP_WIN)
View
2  js/xpconnect/src/XPCJSRuntime.cpp
@@ -33,7 +33,7 @@
#include "mozilla/Attributes.h"
#include "AccessCheck.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsJSPrincipals.h"
#include <algorithm>
View
2  layout/base/FrameLayerBuilder.cpp
@@ -24,7 +24,7 @@
#include "nsSVGIntegrationUtils.h"
#include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "mozilla/gfx/Tools.h"
#include "nsAnimationManager.h"
View
2  layout/base/RestyleTracker.cpp
@@ -11,7 +11,7 @@
#include "RestyleTracker.h"
#include "nsCSSFrameConstructor.h"
#include "nsStyleChangeList.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
namespace mozilla {
namespace css {
View
2  layout/base/nsCSSFrameConstructor.cpp
@@ -124,7 +124,7 @@
#include "nsRefreshDriver.h"
#include "nsRuleProcessorData.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace mozilla;
using namespace mozilla::dom;
View
2  layout/base/nsCSSRendering.cpp
@@ -50,7 +50,7 @@
#include "nsSVGEffects.h"
#include "nsSVGIntegrationUtils.h"
#include "gfxDrawable.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsCSSRenderingBorders.h"
#include "mozilla/css/ImageLoader.h"
#include "ImageContainer.h"
View
2  layout/base/nsCSSRenderingBorders.cpp
@@ -25,7 +25,7 @@
#include "nsLayoutUtils.h"
#include "nsINameSpaceManager.h"
#include "nsBlockFrame.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsExpirationTracker.h"
#include "RoundedRect.h"
View
2  layout/base/nsDisplayList.cpp
@@ -43,7 +43,7 @@
#include "nsSVGEffects.h"
#include "nsSVGElement.h"
#include "nsSVGClipPathFrame.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsAnimationManager.h"
#include "nsTransitionManager.h"
#include "nsViewManager.h"
View
2  layout/base/nsFrameManager.cpp
@@ -63,7 +63,7 @@
#include "nsFrameManager.h"
#include "nsRuleProcessorData.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef ACCESSIBILITY
#include "nsAccessibilityService.h"
View
2  layout/base/nsLayoutUtils.cpp
@@ -88,7 +88,7 @@
#include "nsXULPopupManager.h"
#endif
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsAnimationManager.h"
#include "nsTransitionManager.h"
#include "nsViewportInfo.h"
View
2  layout/base/nsPresShell.cpp
@@ -174,7 +174,7 @@
#include "mozilla/Preferences.h"
#include "mozilla/Telemetry.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "mozilla/css/ImageLoader.h"
#include "Layers.h"
View
2  layout/base/nsRefreshDriver.cpp
@@ -40,7 +40,7 @@
#include "nsContentUtils.h"
#include "mozilla/Preferences.h"
#include "nsViewManager.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsNPAPIPluginInstance.h"
using mozilla::TimeStamp;
View
2  layout/generic/nsObjectFrame.cpp
@@ -67,7 +67,7 @@
#include "nsIObserverService.h"
#include "nsIScrollableFrame.h"
#include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include <algorithm>
// headers for plugin scriptability
View
2  layout/generic/nsTextFrameThebes.cpp
@@ -79,7 +79,7 @@
#include "mozilla/dom/Element.h"
#include "mozilla/LookAndFeel.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef DEBUG
#undef NOISY_BLINK
View
2  layout/generic/nsViewportFrame.cpp
@@ -17,7 +17,7 @@
#include "FrameLayerBuilder.h"
#include "nsSubDocumentFrame.h"
#include "nsAbsoluteContainingBlock.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace mozilla;
View
2  layout/style/nsStyleContext.cpp
@@ -20,7 +20,7 @@
#include "nsRuleNode.h"
#include "nsStyleContext.h"
#include "nsStyleAnimation.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef DEBUG
// #define NOISY_DEBUG
View
2  layout/style/nsStyleSet.cpp
@@ -29,7 +29,7 @@
#include "nsEventStates.h"
#include "nsStyleSheetService.h"
#include "mozilla/dom/Element.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using namespace mozilla;
using namespace mozilla::dom;
View
2  netwerk/base/src/nsInputStreamPump.cpp
@@ -15,7 +15,7 @@
#include "nsThreadUtils.h"
#include "nsCOMPtr.h"
#include "prlog.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include <algorithm>
static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID);
View
2  netwerk/base/src/nsStreamLoader.cpp
@@ -7,7 +7,7 @@
#include "nsIInputStream.h"
#include "nsIChannel.h"
#include "nsError.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
nsStreamLoader::nsStreamLoader()
: mData(nullptr),
View
2  netwerk/protocol/http/nsHttpChannel.cpp
@@ -29,7 +29,7 @@
#include "mozilla/TimeStamp.h"
#include "nsError.h"
#include "nsAlgorithm.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsIConsoleService.h"
#include "base/compiler_specific.h"
#include "NullHttpTransaction.h"
View
2  parser/html/nsHtml5TreeOpExecutor.cpp
@@ -28,7 +28,7 @@
#include "nsHtml5TreeBuilder.h"
#include "nsHtml5StreamParser.h"
#include "mozilla/css/Loader.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsIScriptError.h"
#include "nsIScriptContext.h"
#include "mozilla/Preferences.h"
View
2  storage/src/mozStorageConnection.cpp
@@ -35,7 +35,7 @@
#include "SQLCollations.h"
#include "FileSystemModule.h"
#include "mozStorageHelper.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "prlog.h"
#include "prprf.h"
View
2  storage/src/mozStorageStatement.cpp
@@ -23,7 +23,7 @@
#include "mozStorageStatementParams.h"
#include "mozStorageStatementRow.h"
#include "mozStorageStatement.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "prlog.h"
View
2  toolkit/components/places/nsAnnotationService.cpp
@@ -18,7 +18,7 @@
#include "nsVariant.h"
#include "mozilla/storage.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsNetCID.h"
View
2  toolkit/components/places/nsNavBookmarks.cpp
@@ -18,7 +18,7 @@
#include "mozilla/storage.h"
#include "mozilla/Util.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#define BOOKMARKS_TO_KEYWORDS_INITIAL_CACHE_SIZE 64
#define RECENT_BOOKMARKS_INITIAL_CACHE_SIZE 10
View
2  toolkit/components/startup/StartupTimeline.h
@@ -23,7 +23,7 @@ mozilla_StartupTimeline_Event(FIRST_LOAD_URI, "firstLoadURI")
#include "prtime.h"
#include "nscore.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef MOZ_LINKER
extern "C" {
View
2  toolkit/components/startup/nsAppStartup.cpp
@@ -25,7 +25,7 @@
#include "nsAutoPtr.h"
#include "nsStringGlue.h"
#include "mozilla/Preferences.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "prprf.h"
#include "nsCRT.h"
View
4 toolkit/xre/EventTracer.cpp
@@ -48,7 +48,7 @@
* it took for the event to be serviced.
*/
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "EventTracer.h"
@@ -121,7 +121,7 @@ void TracerThread(void *arg)
while (!sExit) {
TimeStamp start(TimeStamp::Now());
- SAMPLER_RESPONSIVENESS(start);
+ profiler_responsiveness(start);
PRIntervalTime next_sleep = interval;
//TODO: only wait up to a maximum of interval; return
View
2  toolkit/xre/nsAppRunner.cpp
@@ -2758,7 +2758,7 @@ static DWORD InitDwriteBG(LPVOID lpdwThreadParam)
bool fire_glxtest_process();
#endif
-#include "sampler.h"
+#include "GeckoProfiler.h"
// Encapsulates startup and shutdown state for XRE_main
class XREMain
View
2  toolkit/xre/nsEmbedFunctions.cpp
@@ -74,7 +74,7 @@
#include "mozilla/ipc/TestShellParent.h"
#include "mozilla/ipc/XPCShellEnvironment.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef MOZ_IPDL_TESTS
#include "mozilla/_ipdltest/IPDLUnitTests.h"
View
2  tools/profiler/sampler.h → tools/profiler/GeckoProfiler.h
@@ -137,7 +137,7 @@ static inline void profiler_unlock() {}
#else
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
#endif
View
4 tools/profiler/sps_sampler.h → tools/profiler/GeckoProfilerImpl.h
@@ -69,8 +69,8 @@ void mozilla_sampler_stop2();
bool mozilla_sampler_is_active1();
bool mozilla_sampler_is_active2();
-void mozilla_sampler_responsiveness1(TimeStamp time);
-void mozilla_sampler_responsiveness2(TimeStamp time);
+void mozilla_sampler_responsiveness1(const TimeStamp& time);
+void mozilla_sampler_responsiveness2(const TimeStamp& time);
void mozilla_sampler_frame_number1(int frameNumber);
void mozilla_sampler_frame_number2(int frameNumber);
View
4 tools/profiler/Makefile.in
@@ -14,11 +14,11 @@ XPCSHELL_TESTS = tests
include $(DEPTH)/config/autoconf.mk
-EXPORTS = sampler.h
+EXPORTS = GeckoProfiler.h
ifdef MOZ_ENABLE_PROFILER_SPS
EXPORTS += \
- sps_sampler.h \
+ GeckoProfilerImpl.h \
shared-libraries.h \
$(NULL)
View
2  tools/profiler/ProfileEntry2.cpp
@@ -4,7 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include <iostream>
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
#include "platform.h"
#include "nsThreadUtils.h"
View
1  tools/profiler/ProfileEntry2.h
@@ -6,6 +6,7 @@
#ifndef MOZ_PROFILE_ENTRY_H
#define MOZ_PROFILE_ENTRY_H
+#include "GeckoProfilerImpl.h"
#include "mozilla/Mutex.h"
class ThreadProfile2;
View
2  tools/profiler/TableTicker.cpp
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <fstream>
#include <sstream>
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
#include "platform.h"
#include "nsXULAppAPI.h"
#include "nsThreadUtils.h"
View
6 tools/profiler/TableTicker2.cpp
@@ -16,7 +16,7 @@
// Profiler
#include "PlatformMacros.h"
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
#include "platform.h"
#include "nsXULAppAPI.h"
#include "nsThreadUtils.h"
@@ -45,7 +45,7 @@
// JS
#include "jsdbgapi.h"
-// This file's exports are listed in sps_sampler.h.
+// This file's exports are listed in GeckoProfilerImpl.h.
// Pseudo backtraces are available on all platforms. Native
// backtraces are available only on selected platforms. Breakpad is
@@ -961,7 +961,7 @@ bool mozilla_sampler_is_active2()
static double sResponsivenessTimes[100];
static unsigned int sResponsivenessLoc = 0;
-void mozilla_sampler_responsiveness2(TimeStamp aTime)
+void mozilla_sampler_responsiveness2(const TimeStamp& aTime)
{
if (!sLastTracerEvent.IsNull()) {
if (sResponsivenessLoc == 100) {
View
3  tools/profiler/UnwinderThread2.cpp
@@ -25,7 +25,6 @@
#include "mozilla/StandardInteger.h"
#include "PlatformMacros.h"
-#include "sps_sampler.h"
#include "platform.h"
#include <iostream>
@@ -67,7 +66,7 @@
//////////////////////////////////////////////////////////
//// BEGIN externally visible functions (WINDOWS STUBS)
-// On Windows this will all need reworking. sps_sampler.h
+// On Windows this will all need reworking. GeckoProfilerImpl.h
// will ensure these functions are never actually called,
// so just provide no-op stubs for now.
View
2  tools/profiler/UnwinderThread2.h
@@ -6,7 +6,7 @@
#ifndef MOZ_UNWINDER_THREAD_2_H
#define MOZ_UNWINDER_THREAD_2_H
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
#include "ProfileEntry2.h"
/* Top level exports of UnwinderThread.cpp. */
View
2  tools/profiler/nsProfiler.cpp
@@ -8,7 +8,7 @@
#ifdef MOZ_INSTRUMENT_EVENT_LOOP
#include "EventTracer.h"
#endif
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsProfiler.h"
#include "nsMemory.h"
#include "nsString.h"
View
2  tools/profiler/platform-linux.cc
@@ -59,7 +59,7 @@
#include <errno.h>
#include <stdarg.h>
#include "platform.h"
-#include "sps_sampler.h"
+#include "GeckoProfilerImpl.h"
#include <string.h>
#include <stdio.h>
View
2  view/src/nsViewManager.cpp
@@ -21,7 +21,7 @@
#include "nsPresContext.h"
#include "nsEventStateManager.h"
#include "mozilla/StartupTimeline.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsRefreshDriver.h"
#include "mozilla/Preferences.h"
#include "nsContentUtils.h"
View
2  widget/android/nsAppShell.cpp
@@ -39,7 +39,7 @@
#include "mozilla/dom/ScreenOrientation.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#ifdef MOZ_ANDROID_HISTORY
#include "nsNetUtil.h"
#include "IHistory.h"
View
2  widget/cocoa/nsAppShell.mm
@@ -32,7 +32,7 @@
#include "nsToolkit.h"
#include "TextInputHandler.h"
#include "mozilla/HangMonitor.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "npapi.h"
View
2  widget/cocoa/nsChildView.mm
@@ -64,7 +64,7 @@
#include <ApplicationServices/ApplicationServices.h>
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include "nsIDOMWheelEvent.h"
View
2  widget/gonk/nsAppShell.cpp
@@ -50,7 +50,7 @@
#include "libui/InputReader.h"
#include "libui/InputDispatcher.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#define LOG(args...) \
__android_log_print(ANDROID_LOG_INFO, "Gonk" , ## args)
View
2  xpcom/base/nsCycleCollector.cpp
@@ -126,7 +126,7 @@
#include "nsMemoryInfoDumper.h"
#include "xpcpublic.h"
#include "nsXPCOMPrivate.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
#include <stdio.h>
#include <string.h>
#ifdef WIN32
View
2  xpcom/build/nsXPComInit.cpp
@@ -122,7 +122,7 @@ extern nsresult nsStringInputStreamConstructor(nsISupports *, REFNSIID, void **)
#include "mozilla/VisualEventTracer.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using base::AtExitManager;
using mozilla::ipc::BrowserProcessSubThread;
View
2  xpcom/threads/nsTimerImpl.cpp
@@ -10,7 +10,7 @@
#include "nsThreadManager.h"
#include "nsThreadUtils.h"
#include "plarena.h"
-#include "sampler.h"
+#include "GeckoProfiler.h"
using mozilla::TimeDuration;
using mozilla::TimeStamp;
Please sign in to comment.
Something went wrong with that request. Please try again.