Bug 1733308 - Fix non-unified builds errors in xpcom/threads. r=xpcom-reviewers,mccr8

xpcom/threads/CPUUsageWatcher.cpp:43:23: error: unused variable 'kCPUCheckInterval' [-Werror,-Wunused-const-variable]
xpcom/threads/CPUUsageWatcher.cpp:109:23: error: unused variable 'kCPUCheckInterval' [-Werror,-Wunused-const-variable]
xpcom/threads/InputEventStatistics.cpp:18:5: error: use of undeclared identifier 'ClearOnShutdown'
xpcom/threads/InputTaskManager.cpp:62:9: error: use of undeclared identifier 'InputEventStatistics'
xpcom/threads/InputTaskManager.cpp:89:3: error: use of undeclared identifier 'InputEventStatistics'
xpcom/threads/InputTaskManager.cpp:105:7: error: use of undeclared identifier 'nsRefreshDriver'
xpcom/threads/InputTaskManager.cpp:124:9: error: use of undeclared identifier 'InputEventStatistics'
xpcom/threads/MainThreadIdlePeriod.cpp:29:23: error: unused variable 'kMaxTimerThreadBoundClamp' [-Werror,-Wunused-const-variable]
xpcom/threads/VsyncTaskManager.h:15:67: error: implicit instantiation of undefined template 'mozilla::StaticRefPtr<mozilla::VsyncTaskManager>'
xpcom/threads/VsyncTaskManager.h:16:52: error: no viable overloaded '='
xpcom/threads/nsMemoryPressure.cpp:61:12: error: use of undeclared identifier 'nsIObserverService'
xpcom/threads/nsMemoryPressure.cpp:61:37: error: use of undeclared identifier 'services'
xpcom/threads/nsThreadManager.cpp:422:28: error: member access into incomplete type 'mozilla::ThreadEventTarget'
xpcom/threads/nsThreadManager.cpp:661:5: error: use of undeclared identifier 'CrashReporter'
xpcom/threads/nsThreadManager.cpp:662:59: error: expected ')'
xpcom/threads/nsThreadManager.cpp:662:9: error: use of undeclared identifier 'CrashReporter'
xpcom/threads/nsThreadManager.cpp:669:7: error: use of undeclared identifier 'CrashReporter'
xpcom/threads/nsThreadManager.cpp:670:11: error: use of undeclared identifier 'CrashReporter'
xpcom/threads/nsThreadManager.cpp:670:61: error: expected ')'
xpcom/threads/nsThreadManager.cpp:672:7: error: use of undeclared identifier 'CrashReporter'
xpcom/threads/nsThreadManager.cpp:673:11: error: use of undeclared identifier 'CrashReporter'
xpcom/threads/nsThreadUtils.cpp:636:13: error: member access into incomplete type 'mozilla::Task'

Differential Revision: https://phabricator.services.mozilla.com/D127041
This commit is contained in:
Mike Hommey 2021-10-01 01:49:18 +00:00
parent c8c38574a4
commit 25134bc800
9 changed files with 10 additions and 8 deletions

View File

@ -40,7 +40,6 @@ struct CPUStats {
static const uint64_t kMicrosecondsPerSecond = 1000000LL;
static const uint64_t kNanosecondsPerMicrosecond = 1000LL;
static const uint64_t kCPUCheckInterval = kMicrosecondsPerSecond / 2LL;
static uint64_t GetMicroseconds(timeval time) {
return ((uint64_t)time.tv_sec) * kMicrosecondsPerSecond +
@ -105,9 +104,6 @@ static Result<CPUStats, CPUUsageWatcherError> GetGlobalCPUStats() {
# ifdef XP_WIN
// A FILETIME represents the number of 100-nanosecond ticks since 1/1/1601 UTC
static const uint64_t kFILETIMETicksPerSecond = 10000000;
static const uint64_t kCPUCheckInterval = kFILETIMETicksPerSecond / 2;
uint64_t FiletimeToInteger(FILETIME filetime) {
return ((uint64_t)filetime.dwLowDateTime) | (uint64_t)filetime.dwHighDateTime
<< 32;

View File

@ -6,6 +6,7 @@
#include "InputEventStatistics.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/Preferences.h"
#include "nsRefreshDriver.h"

View File

@ -5,7 +5,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "InputTaskManager.h"
#include "InputEventStatistics.h"
#include "VsyncTaskManager.h"
#include "nsRefreshDriver.h"
namespace mozilla {

View File

@ -25,8 +25,7 @@ static const double kLongIdlePeriodMS = 50.0;
// or during page load
// now + idle_period.during_page_load.min + layout.idle_period.time_limit
static const uint32_t kMaxTimerThreadBound = 5; // milliseconds
static const uint32_t kMaxTimerThreadBoundClamp = 15; // milliseconds
static const uint32_t kMaxTimerThreadBound = 5; // milliseconds
namespace mozilla {

View File

@ -8,6 +8,7 @@
#define mozilla_VsyncTaskManager_h
#include "TaskController.h"
#include "mozilla/StaticPtr.h"
namespace mozilla {
class VsyncTaskManager : public TaskManager {

View File

@ -132,5 +132,3 @@ LOCAL_INCLUDES += [
FINAL_LIBRARY = "xul"
include("/ipc/chromium/chromium-config.mozbuild")
REQUIRES_UNIFIED_BUILD = True

View File

@ -7,8 +7,10 @@
#include "nsMemoryPressure.h"
#include "mozilla/Assertions.h"
#include "mozilla/Atomics.h"
#include "mozilla/Services.h"
#include "nsThreadUtils.h"
#include "nsIObserverService.h"
using namespace mozilla;

View File

@ -11,6 +11,7 @@
#include "nsIClassInfoImpl.h"
#include "nsTArray.h"
#include "nsXULAppAPI.h"
#include "nsExceptionHandler.h"
#include "mozilla/AbstractThread.h"
#include "mozilla/AppShutdown.h"
#include "mozilla/ClearOnShutdown.h"
@ -25,6 +26,7 @@
#include "mozilla/ThreadEventQueue.h"
#include "mozilla/ThreadLocal.h"
#include "TaskController.h"
#include "ThreadEventTarget.h"
#ifdef MOZ_CANARY
# include <fcntl.h>
# include <unistd.h>

View File

@ -18,6 +18,7 @@
#include "prsystem.h"
#include "nsThreadManager.h"
#include "TaskController.h"
#ifdef XP_WIN
# include <windows.h>