Backed out 4 changesets (bug 1325299) for frequent Win7VM failures in browser_addonPerformanceAlerts.js a=backout
authorWes Kocher <wkocher@mozilla.com>
Fri, 20 Jan 2017 12:46:34 -0800
changeset 375335 41d8ef56d03b9b5b382d0575def6712d9d51b1df
parent 375334 16e7adbfad3644cf6defb631f461b11305b625c0
child 375448 487a4e43eb9d1f04a5d8e3dd183fe38dbe105e1f
child 375449 b3f4b8aa71e00e282583f9383267c17acc00a108
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1325299
milestone53.0a1
backs outcac5baad14a1afc0534c083191cad8bfd5c6429e
933d06e4b5673ecf5fdc15a00f1c49e0d4acda4a
c168221313d64199d7f7f7b9c48498ed7e476b5d
dcf71e5e5fc30c714129e342959247681981c557
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
Backed out 4 changesets (bug 1325299) for frequent Win7VM failures in browser_addonPerformanceAlerts.js a=backout Backed out changeset cac5baad14a1 (bug 1325299) Backed out changeset 933d06e4b567 (bug 1325299) Backed out changeset c168221313d6 (bug 1325299) Backed out changeset dcf71e5e5fc3 (bug 1325299) MozReview-Commit-ID: DLAtTjf0iPB
ipc/chromium/chromium-config.mozbuild
js/src/build.rs
js/src/old-configure.in
media/webrtc/trunk/build/common.gypi
old-configure.in
toolkit/components/perfmonitoring/nsPerformanceStats.cpp
toolkit/library/moz.build
--- a/ipc/chromium/chromium-config.mozbuild
+++ b/ipc/chromium/chromium-config.mozbuild
@@ -7,16 +7,17 @@
 LOCAL_INCLUDES += [
     '!/ipc/ipdl/_ipdlheaders',
     '/ipc/chromium/src',
     '/ipc/glue',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [
+        'psapi',
         'shell32',
         'dbghelp',
     ]
 
     DEFINES.update({
         'UNICODE': True,
         '_UNICODE': True,
         '_CRT_RAND_S': True,
--- a/js/src/build.rs
+++ b/js/src/build.rs
@@ -35,16 +35,17 @@ fn main() {
         .status()
         .expect("Should spawn autospider OK");
     assert!(result.success(), "autospider should exit OK");
 
     println!("cargo:rustc-link-search=native={}/js/src", out_dir);
 
     if target.contains("windows") {
         println!("cargo:rustc-link-lib=winmm");
+        println!("cargo:rustc-link-lib=psapi");
         if target.contains("gnu") {
             println!("cargo:rustc-link-lib=stdc++");
         }
     } else {
         println!("cargo:rustc-link-lib=stdc++");
     }
 
     println!("cargo:rustc-link-lib=static=js_static");
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -128,17 +128,17 @@ else
 fi
 
 MOZ_TOOL_VARIABLES
 
 dnl Special win32 checks
 dnl ========================================================
 
 # Target the Windows 8.1 SDK by default
-WINVER=601
+WINVER=502
 
 case "$target" in
 *-mingw*)
     if test "$GCC" != "yes"; then
         # Check to see if we are really running in a msvc environemnt
         _WIN32_MSVC=1
 
         # Make sure compilers are valid
@@ -247,18 +247,18 @@ case "$target" in
                 "$_WINDRES_RELEASE_VERSION" -lt "$WINDRES_RELEASE_VERSION"
         then
             AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
         fi
     fi # !GNU_CC
 
     AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
     AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
-    # Require OS features provided by IE 8.0 (Win7)
-    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0800)
+    # Require OS features provided by IE 6.0 SP2 (XP SP2)
+    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0603)
 
     ;;
 esac
 
 if test -n "$_WIN32_MSVC"; then
     SKIP_PATH_CHECKS=1
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
@@ -654,17 +654,17 @@ case "$target" in
         MKSHLIB='$(CXX) $(DSO_LDOPTS) -o $@'
         MKCSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
         RC='$(WINDRES)'
         # Use static libgcc and libstdc++
         LDFLAGS="$LDFLAGS -static"
         # Use temp file for windres (bug 213281)
         RCFLAGS='-O coff --use-temp-file'
         # mingw doesn't require kernel32, user32, and advapi32 explicitly
-        LIBS="$LIBS -lgdi32 -lwinmm -lwsock32"
+        LIBS="$LIBS -lgdi32 -lwinmm -lwsock32 -lpsapi"
         MOZ_FIX_LINK_PATHS=
         DLL_PREFIX=
         IMPORT_LIB_SUFFIX=a
 
         WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
         WIN32_GUI_EXE_LDFLAGS=-mwindows
     else
         TARGET_COMPILER_ABI=msvc
@@ -791,17 +791,17 @@ case "$target" in
             # classes, and clang-cl helpfully warns about its non-support
             # for such cases.  We're not particularly worried about that,
             # so ignore that warning.
             CXXFLAGS="$CXXFLAGS -Wno-ignored-attributes"
         fi
         # make 'foo == bar;' error out
         CFLAGS="$CFLAGS -we4553"
         CXXFLAGS="$CXXFLAGS -we4553"
-        LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib"
+        LIBS="$LIBS kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib psapi.lib"
         MOZ_DEBUG_LDFLAGS='-DEBUG -DEBUGTYPE:CV'
         WARNINGS_AS_ERRORS='-WX'
         MOZ_OPTIMIZE_FLAGS="-O2"
         MOZ_FIX_LINK_PATHS=
         LDFLAGS="$LDFLAGS -LARGEADDRESSAWARE -NXCOMPAT"
         if test -z "$DEVELOPER_OPTIONS"; then
             LDFLAGS="$LDFLAGS -RELEASE"
         fi
--- a/media/webrtc/trunk/build/common.gypi
+++ b/media/webrtc/trunk/build/common.gypi
@@ -3322,16 +3322,17 @@
       },  # target_defaults
     }],  # OS=="ios"
     ['OS=="win"', {
       'target_defaults': {
         'defines': [
           'WIN32',
           '_WINDOWS',
           'NOMINMAX',
+          'PSAPI_VERSION=1',
           '_CRT_RAND_S',
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           'WIN32_LEAN_AND_MEAN',
           '_ATL_NO_OPENGL',
         ],
         'conditions': [
           ['build_with_mozilla==0', {
               'defines': [
@@ -3449,16 +3450,17 @@
           'VCLinkerTool': {
             'AdditionalDependencies': [
               'wininet.lib',
               'dnsapi.lib',
               'version.lib',
               'msimg32.lib',
               'ws2_32.lib',
               'usp10.lib',
+              'psapi.lib',
               'dbghelp.lib',
               'winmm.lib',
               'shlwapi.lib',
             ],
 
             'conditions': [
               ['msvs_express', {
                 # Explicitly required when using the ATL with express
--- a/old-configure.in
+++ b/old-configure.in
@@ -198,17 +198,17 @@ if test -n "$MOZ_WINCONSOLE"; then
 fi
 
 MOZ_TOOL_VARIABLES
 
 dnl ========================================================
 dnl Special win32 checks
 dnl ========================================================
 
-WINVER=601
+WINVER=502
 
 case "$target" in
 *-mingw*)
     if test "$GCC" != "yes"; then
         # Check to see if we are really running in a msvc environemnt
         _WIN32_MSVC=1
         AC_CHECK_PROGS(MIDL, midl)
 
@@ -393,18 +393,18 @@ case "$target" in
 
         # strsafe.h on mingw uses macros for function deprecation that pollutes namespace
         # causing problems with local implementations with the same name.
         AC_DEFINE(STRSAFE_NO_DEPRECATE)
     fi # !GNU_CC
 
     AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
     AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
-    # Require OS features provided by IE 8.0 (Win7)
-    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0800)
+    # Require OS features provided by IE 6.0 SP2 (XP SP2)
+    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0603)
 
     ;;
 esac
 
 if test -n "$_WIN32_MSVC"; then
     SKIP_PATH_CHECKS=1
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
--- a/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
+++ b/toolkit/components/perfmonitoring/nsPerformanceStats.cpp
@@ -1214,17 +1214,18 @@ nsPerformanceStatsService::CommitGroup(u
     return;
   }
 
   // When we add a group as changed, we immediately set its
   // `recentTicks` from 0 to 1.  If we have `ticksDelta == 0` at
   // this stage, we have already called `resetRecentData` but we
   // haven't removed it from the list.
   MOZ_ASSERT(ticksDelta != 0);
-  if (cyclesDelta > totalCyclesDelta || cyclesDelta == 0 || totalCyclesDelta == 0) {
+  MOZ_ASSERT(cyclesDelta <= totalCyclesDelta);
+  if (cyclesDelta == 0 || totalCyclesDelta == 0) {
     // Nothing useful, don't commit.
     return;
   }
 
   double proportion = (double)cyclesDelta / (double)totalCyclesDelta;
   MOZ_ASSERT(proportion <= 1);
 
   const uint64_t userTimeDelta = proportion * totalUserTimeDelta;
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -22,16 +22,17 @@ def Libxul(name):
         GeckoSharedLibrary(name, linkage=None)
         SHARED_LIBRARY_NAME = 'xul'
 
     DELAYLOAD_DLLS += [
         'comdlg32.dll',
         'dbghelp.dll',
         'netapi32.dll',
         'PowrProf.dll',
+        'psapi.dll',
         'rasapi32.dll',
         'rasdlg.dll',
         'secur32.dll',
         'wininet.dll',
         'winspool.drv'
     ]
 
     if CONFIG['ACCESSIBILITY']:
@@ -334,16 +335,17 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'ole32',
         'version',
         'winspool',
         'comdlg32',
         'imm32',
         'msimg32',
         'netapi32',
         'shlwapi',
+        'psapi',
         'ws2_32',
         'dbghelp',
         'rasapi32',
         'rasdlg',
         'iphlpapi',
         'uxtheme',
         'setupapi',
         'secur32',