Backout 9b3656db42a7 (Bug 1429623) for bustage.
authorBas Schouten <bschouten@mozilla.com>
Sat, 20 Jan 2018 08:15:57 +0100
changeset 454410 af59a3ed2fcc7fd1d1c91da2598573ee110a1935
parent 454409 9b3656db42a7d63744e2a522029540e8f37815f8
child 454411 d76b88de07ca4fff02828d24db2dbce6e4f3d7e4
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1429623
milestone59.0a1
backs out9b3656db42a7d63744e2a522029540e8f37815f8
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout 9b3656db42a7 (Bug 1429623) for bustage. MozReview-Commit-ID: 9Ar6Y8MKGB1
toolkit/content/license.html
tools/profiler/core/platform.cpp
tools/profiler/moz.build
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -1,9 +1,9 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- 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/.  -->
 
 <html lang="en">
   <head>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
     <title>Licenses</title>
@@ -6784,17 +6784,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
 </pre>
 
     <hr>
 
 
     <h1><a id="vtune"></a>VTune License</h1>
 
     <p>This license applies to certain files in the directory
-    <code>js/src/vtune</code> and <code>tools/profiler/core/vtune</code>.</p>
+    <code>js/src/vtune</code>.</p>
 <pre>
 Copyright (c) 2011 Intel Corporation.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -34,17 +34,16 @@
 
 #include "platform.h"
 #include "PlatformMacros.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Vector.h"
 #include "GeckoProfiler.h"
-#include "VTuneProfiler.h"
 #include "GeckoProfilerReporter.h"
 #include "ProfilerIOInterposeObserver.h"
 #include "mozilla/AutoProfilerLabel.h"
 #include "mozilla/ExtensionPolicyService.h"
 #include "mozilla/Scheduler.h"
 #include "mozilla/StackWalk.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/ThreadLocal.h"
@@ -2178,18 +2177,16 @@ FindLiveThreadInfo(PSLockRef aLock, int*
 
 static void
 locked_register_thread(PSLockRef aLock, const char* aName, void* aStackTop)
 {
   MOZ_RELEASE_ASSERT(CorePS::Exists());
 
   MOZ_RELEASE_ASSERT(!FindLiveThreadInfo(aLock));
 
-  VTUNE_REGISTER_THREAD(aName);
-
   if (!TLSInfo::Init(aLock)) {
     return;
   }
 
   ThreadInfo* info = new ThreadInfo(aName, Thread::GetCurrentId(),
                                     NS_IsMainThread(), aStackTop);
   TLSInfo::SetInfo(aLock, info);
 
@@ -2295,18 +2292,16 @@ SplitAtCommas(const char* aString, Uniqu
   return array;
 }
 
 void
 profiler_init(void* aStackTop)
 {
   LOG("profiler_init");
 
-  VTUNE_INIT();
-
   MOZ_RELEASE_ASSERT(!CorePS::Exists());
 
   if (getenv("MOZ_PROFILER_HELP")) {
     PrintUsageThenExit(0); // terminates execution
   }
 
   SharedLibraryInfo::Initialize();
 
@@ -2445,18 +2440,16 @@ locked_profiler_save_profile_to_file(PSL
 static SamplerThread*
 locked_profiler_stop(PSLockRef aLock);
 
 void
 profiler_shutdown()
 {
   LOG("profiler_shutdown");
 
-  VTUNE_SHUTDOWN();
-
   MOZ_RELEASE_ASSERT(NS_IsMainThread());
   MOZ_RELEASE_ASSERT(CorePS::Exists());
 
   // If the profiler is active we must get a handle to the SamplerThread before
   // ActivePS is destroyed, in order to delete it.
   SamplerThread* samplerThread = nullptr;
   {
     PSAutoLock lock(gPSMutex);
@@ -3331,35 +3324,31 @@ profiler_add_marker_for_thread(int aThre
 }
 
 void
 profiler_tracing(const char* aCategory, const char* aMarkerName,
                  TracingKind aKind)
 {
   MOZ_RELEASE_ASSERT(CorePS::Exists());
 
-  VTUNE_TRACING(aMarkerName, aKind);
-
   // This function is hot enough that we use RacyFeatures, notActivePS.
   if (!RacyFeatures::IsActiveWithoutPrivacy()) {
     return;
   }
 
   auto payload = MakeUnique<TracingMarkerPayload>(aCategory, aKind);
   racy_profiler_add_marker(aMarkerName, Move(payload));
 }
 
 void
 profiler_tracing(const char* aCategory, const char* aMarkerName,
                  TracingKind aKind, UniqueProfilerBacktrace aCause)
 {
   MOZ_RELEASE_ASSERT(CorePS::Exists());
 
-  VTUNE_TRACING(aMarkerName, aKind);
-
   // This function is hot enough that we use RacyFeatures, notActivePS.
   if (!RacyFeatures::IsActiveWithoutPrivacy()) {
     return;
   }
 
   auto payload =
     MakeUnique<TracingMarkerPayload>(aCategory, aKind, Move(aCause));
   racy_profiler_add_marker(aMarkerName, Move(payload));
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -116,23 +116,16 @@ IPDL_SOURCES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 # GeckoProfiler.h is the only code that's visible in non-MOZ_GECKO_PROFILER
 # builds, and it only contains no-op macros in that case.
 EXPORTS += [
     'public/GeckoProfiler.h',
 ]
 
-if CONFIG['MOZ_VTUNE']:
-    DEFINES['MOZ_VTUNE_INSTRUMENTATION'] = True
-    UNIFIED_SOURCES += [
-        'core/VTuneProfiler.cpp',
-    ]
-
-
 if CONFIG['MOZ_TASK_TRACER']:
     EXPORTS += [
         'tasktracer/GeckoTaskTracer.h',
         'tasktracer/GeckoTaskTracerImpl.h',
         'tasktracer/SourceEventTypeMap.h',
         'tasktracer/TracedTaskCommon.h',
     ]
     UNIFIED_SOURCES += [