Reduce includes of windows.h

Windows.h is included in a number of key header files which means that a majority of the translation units when building Chrome include Windows.h. This is slowing down builds. This change creates a new header - base/win/windows_types.h - which contains typedefs and defines of common Windows.h types - and uses this in place of windows.h in enough places to reduce the number of translation units that include windows.h in a build of the 'chrome' target (debug component non-jumbo) by 5219, from 19041 to 13822, giving measurable build-time speedups (~2.5-3.0%). Follow-up changes will apply the same techniques to more headers and drop the number much further. Perversely enough, this change also adds includes of windows.h in many places - places that always needed windows.h but were implicitly depending on it being included elsewhere. [email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected] TBRing mechanical changes, reviewers: jochen@ : Please review changes to chrome/, components/, content/, third_party/WebKit/Source/platform wfh@ : Please review changes to courgette/, sandbox/win rockot@ : Please review changes to device/, ipc/, services/ mef@ : Please review changes to net/ raymes@ : Please review changes to ppapi/ joedow@ : Please review changes to remoting/ rogerta@ : Please review changes to rlz/ jsbell@: Please review changes to storage/ dpranke@ : Please review changes to tools/gn/ sky@ : Please review changes to ui/ Bug: 796644,798763 Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: I3958d0d7d813bed74d9b166e0358dbde5b5729af Reviewed-on: https://chromium-review.googlesource.com/846422 Commit-Queue: Bruce Dawson <[email protected]> Reviewed-by: Misha Efimov <[email protected]> Reviewed-by: Scott Violet <[email protected]> Reviewed-by: John Abd-El-Malek <[email protected]> Reviewed-by: Daniel Cheng <[email protected]> Cr-Commit-Position: refs/heads/master@{#526881}
feiyue1206 · Jan 4, 2018 · bfdc3fd · bfdc3fd
1 parent 2e824f4
commit bfdc3fd
Show file tree

Hide file tree

Showing 104 changed files with 542 additions and 50 deletions.
diff --git a/base/BUILD.gn b/base/BUILD.gn
@@ -2331,6 +2331,7 @@ test("base_unittests") {
     "win/shortcut_unittest.cc",
     "win/startup_information_unittest.cc",
     "win/wait_chain_unittest.cc",
+    "win/win_includes_unittest.cc",
     "win/win_util_unittest.cc",
     "win/windows_version_unittest.cc",
     "win/winrt_storage_util_unittest.cc",

diff --git a/base/allocator/allocator_shim_override_ucrt_symbols_win.h b/base/allocator/allocator_shim_override_ucrt_symbols_win.h
@@ -12,6 +12,8 @@
 
 #include <malloc.h>
 
+#include <windows.h>
+
 extern "C" {
 
 void* (*malloc_unchecked)(size_t) = &base::allocator::UncheckedAlloc;

diff --git a/base/allocator/partition_allocator/address_space_randomization.cc b/base/allocator/partition_allocator/address_space_randomization.cc
@@ -11,6 +11,8 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
+#include <windows.h>  // Must be in front of other Windows header files.
+
 #include <VersionHelpers.h>
 #endif
 

diff --git a/base/atomicops_internals_x86_msvc.h b/base/atomicops_internals_x86_msvc.h
@@ -7,7 +7,7 @@
 #ifndef BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_
 #define BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_
 
-#include <windows.h>
+#include "base/win/windows_types.h"
 
 #include <intrin.h>
 
@@ -61,8 +61,10 @@ inline void MemoryBarrier() {
   // See #undef and note at the top of this file.
   __faststorefence();
 #else
-  // We use MemoryBarrier from WinNT.h
-  ::MemoryBarrier();
+  // We use the implementation of MemoryBarrier from WinNT.h
+  LONG barrier;
+
+  _InterlockedOr(&barrier, 0);
 #endif
 }
 
@@ -115,25 +117,25 @@ static_assert(sizeof(Atomic64) == sizeof(PVOID), "atomic word is atomic");
 inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
                                          Atomic64 old_value,
                                          Atomic64 new_value) {
-  PVOID result = InterlockedCompareExchangePointer(
-    reinterpret_cast<volatile PVOID*>(ptr),
-    reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
+  PVOID result = _InterlockedCompareExchangePointer(
+      reinterpret_cast<volatile PVOID*>(ptr),
+      reinterpret_cast<PVOID>(new_value), reinterpret_cast<PVOID>(old_value));
   return reinterpret_cast<Atomic64>(result);
 }
 
 inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
                                          Atomic64 new_value) {
-  PVOID result = InterlockedExchangePointer(
-    reinterpret_cast<volatile PVOID*>(ptr),
-    reinterpret_cast<PVOID>(new_value));
+  PVOID result =
+      _InterlockedExchangePointer(reinterpret_cast<volatile PVOID*>(ptr),
+                                  reinterpret_cast<PVOID>(new_value));
   return reinterpret_cast<Atomic64>(result);
 }
 
 inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
                                         Atomic64 increment) {
-  return InterlockedExchangeAdd64(
-      reinterpret_cast<volatile LONGLONG*>(ptr),
-      static_cast<LONGLONG>(increment)) + increment;
+  return _InterlockedExchangeAdd64(reinterpret_cast<volatile LONGLONG*>(ptr),
+                                   static_cast<LONGLONG>(increment)) +
+         increment;
 }
 
 inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,

diff --git a/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc
@@ -15,6 +15,8 @@
 #include "base/time/time.h"
 #include "base/win/object_watcher.h"
 
+#include <windows.h>
+
 namespace base {
 
 namespace {

diff --git a/base/files/file_util.h b/base/files/file_util.h
@@ -23,7 +23,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include "base/win/windows_types.h"
 #elif defined(OS_POSIX)
 #include <sys/stat.h>
 #include <unistd.h>

diff --git a/base/files/file_win.cc b/base/files/file_win.cc
@@ -11,6 +11,8 @@
 #include "base/metrics/histogram_functions.h"
 #include "base/threading/thread_restrictions.h"
 
+#include <windows.h>
+
 namespace base {
 
 // Make sure our Whence mappings match the system headers.

diff --git a/base/files/memory_mapped_file_win.cc b/base/files/memory_mapped_file_win.cc
@@ -13,6 +13,8 @@
 #include "base/strings/string16.h"
 #include "base/threading/thread_restrictions.h"
 
+#include <windows.h>
+
 namespace base {
 
 MemoryMappedFile::MemoryMappedFile() : data_(NULL), length_(0) {

diff --git a/base/files/platform_file.h b/base/files/platform_file.h
@@ -9,8 +9,8 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
 #include "base/win/scoped_handle.h"
+#include "base/win/windows_types.h"
 #endif
 
 // This file defines platform-independent types for dealing with

diff --git a/base/memory/discardable_shared_memory.cc b/base/memory/discardable_shared_memory.cc
@@ -28,6 +28,7 @@
 #endif
 
 #if defined(OS_WIN)
+#include <windows.h>
 #include "base/win/windows_version.h"
 #endif
 

diff --git a/base/memory/shared_memory_handle.h b/base/memory/shared_memory_handle.h
@@ -11,8 +11,8 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
 #include "base/process/process_handle.h"
+#include "base/win/windows_types.h"
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
 #include <mach/mach.h>
 #include "base/base_export.h"

diff --git a/base/memory/shared_memory_handle_win.cc b/base/memory/shared_memory_handle_win.cc
@@ -7,6 +7,8 @@
 #include "base/logging.h"
 #include "base/unguessable_token.h"
 
+#include <windows.h>
+
 namespace base {
 
 SharedMemoryHandle::SharedMemoryHandle() {}

diff --git a/base/metrics/persistent_memory_allocator.cc b/base/metrics/persistent_memory_allocator.cc
@@ -8,6 +8,7 @@
 #include <algorithm>
 
 #if defined(OS_WIN)
+#include <windows.h>
 #include "winbase.h"
 #elif defined(OS_POSIX)
 #include <sys/mman.h>

diff --git a/base/process/memory_win.cc b/base/process/memory_win.cc
@@ -4,10 +4,11 @@
 
 #include "base/process/memory.h"
 
+#include <windows.h>  // Must be in front of other Windows header files.
+
 #include <new.h>
 #include <psapi.h>
 #include <stddef.h>
-#include <windows.h>
 
 // malloc_unchecked is required to implement UncheckedMalloc properly.
 // It's provided by allocator_shim_win.cc but since that's not always present,

diff --git a/base/process/process_handle.h b/base/process/process_handle.h
@@ -13,7 +13,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include "base/win/windows_types.h"
 #endif
 
 #if defined(OS_FUCHSIA)

diff --git a/base/process/process_metrics.h b/base/process/process_metrics.h
@@ -33,13 +33,20 @@
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
+#include "base/win/windows_types.h"
 #endif
 
 namespace base {
 
 #if defined(OS_WIN)
+// _WINDOWS_ will be defined if Windows.h was included - include Windows.h first
+// to get access to the full struct definition.
+#if defined(_WINDOWS_)
 struct IoCounters : public IO_COUNTERS {
 };
+#else
+struct IoCounters;
+#endif
 #elif defined(OS_POSIX)
 struct IoCounters {
   uint64_t ReadOperationCount;

diff --git a/base/process/process_metrics_win.cc b/base/process/process_metrics_win.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// Must be included before process_metrics.h to get full IoCounters definition
+#include <windows.h>
+
 #include "base/process/process_metrics.h"
 
-#include <windows.h>
 #include <psapi.h>
 #include <stddef.h>
 #include <stdint.h>

diff --git a/base/process/process_win.cc b/base/process/process_win.cc
@@ -10,6 +10,8 @@
 #include "base/process/kill.h"
 #include "base/threading/thread_restrictions.h"
 
+#include <windows.h>
+
 namespace {
 
 DWORD kBasicProcessAccess =

diff --git a/base/synchronization/condition_variable.h b/base/synchronization/condition_variable.h
@@ -76,7 +76,7 @@
 #endif
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include "base/win/windows_types.h"
 #endif
 
 namespace base {
@@ -105,8 +105,8 @@ class BASE_EXPORT ConditionVariable {
  private:
 
 #if defined(OS_WIN)
-  CONDITION_VARIABLE cv_;
-  SRWLOCK* const srwlock_;
+  CHROME_CONDITION_VARIABLE cv_;
+  CHROME_SRWLOCK* const srwlock_;
 #elif defined(OS_POSIX)
   pthread_cond_t condition_;
   pthread_mutex_t* user_mutex_;

diff --git a/base/synchronization/condition_variable_win.cc b/base/synchronization/condition_variable_win.cc
@@ -9,6 +9,8 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 
+#include <windows.h>
+
 namespace base {
 
 ConditionVariable::ConditionVariable(Lock* user_lock)
@@ -18,7 +20,7 @@ ConditionVariable::ConditionVariable(Lock* user_lock)
 #endif
 {
   DCHECK(user_lock);
-  InitializeConditionVariable(&cv_);
+  InitializeConditionVariable(reinterpret_cast<PCONDITION_VARIABLE>(&cv_));
 }
 
 ConditionVariable::~ConditionVariable() = default;
@@ -36,7 +38,9 @@ void ConditionVariable::TimedWait(const TimeDelta& max_time) {
   user_lock_->CheckHeldAndUnmark();
 #endif
 
-  if (!SleepConditionVariableSRW(&cv_, srwlock_, timeout, 0)) {
+  if (!SleepConditionVariableSRW(reinterpret_cast<PCONDITION_VARIABLE>(&cv_),
+                                 reinterpret_cast<PSRWLOCK>(srwlock_), timeout,
+                                 0)) {
     // On failure, we only expect the CV to timeout. Any other error value means
     // that we've unexpectedly woken up.
     // Note that WAIT_TIMEOUT != ERROR_TIMEOUT. WAIT_TIMEOUT is used with the
@@ -51,11 +55,11 @@ void ConditionVariable::TimedWait(const TimeDelta& max_time) {
 }
 
 void ConditionVariable::Broadcast() {
-  WakeAllConditionVariable(&cv_);
+  WakeAllConditionVariable(reinterpret_cast<PCONDITION_VARIABLE>(&cv_));
 }
 
 void ConditionVariable::Signal() {
-  WakeConditionVariable(&cv_);
+  WakeConditionVariable(reinterpret_cast<PCONDITION_VARIABLE>(&cv_));
 }
 
 }  // namespace base
diff --git a/base/synchronization/lock_impl.h b/base/synchronization/lock_impl.h
@@ -11,7 +11,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include "base/win/windows_types.h"
 #elif defined(OS_POSIX)
 #include <errno.h>
 #include <pthread.h>
@@ -26,7 +26,7 @@ namespace internal {
 class BASE_EXPORT LockImpl {
  public:
 #if defined(OS_WIN)
-  using NativeHandle = SRWLOCK;
+  using NativeHandle = CHROME_SRWLOCK;
 #elif defined(OS_POSIX)
   using NativeHandle = pthread_mutex_t;
 #endif
@@ -63,7 +63,7 @@ class BASE_EXPORT LockImpl {
 
 #if defined(OS_WIN)
 void LockImpl::Unlock() {
-  ::ReleaseSRWLockExclusive(&native_handle_);
+  ::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_));
 }
 #elif defined(OS_POSIX)
 void LockImpl::Unlock() {

diff --git a/base/synchronization/lock_impl_win.cc b/base/synchronization/lock_impl_win.cc
@@ -6,6 +6,8 @@
 
 #include "base/debug/activity_tracker.h"
 
+#include <windows.h>
+
 namespace base {
 namespace internal {
 
@@ -14,7 +16,8 @@ LockImpl::LockImpl() : native_handle_(SRWLOCK_INIT) {}
 LockImpl::~LockImpl() = default;
 
 bool LockImpl::Try() {
-  return !!::TryAcquireSRWLockExclusive(&native_handle_);
+  return !!::TryAcquireSRWLockExclusive(
+      reinterpret_cast<PSRWLOCK>(&native_handle_));
 }
 
 void LockImpl::Lock() {
@@ -30,7 +33,7 @@ void LockImpl::Lock() {
       return;
 
   base::debug::ScopedLockAcquireActivity lock_activity(this);
-  ::AcquireSRWLockExclusive(&native_handle_);
+  ::AcquireSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_));
 }
 
 }  // namespace internal

diff --git a/base/synchronization/waitable_event_watcher_win.cc b/base/synchronization/waitable_event_watcher_win.cc
@@ -8,6 +8,8 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/win/object_watcher.h"
 
+#include <windows.h>
+
 namespace base {
 
 WaitableEventWatcher::WaitableEventWatcher() = default;

diff --git a/base/syslog_logging.cc b/base/syslog_logging.cc
@@ -5,6 +5,7 @@
 #include "base/syslog_logging.h"
 
 #if defined(OS_WIN)
+#include <windows.h>
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/stack_trace.h"

diff --git a/base/test/test_reg_util_win.cc b/base/test/test_reg_util_win.cc
@@ -15,6 +15,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#include <windows.h>
+
 namespace registry_util {
 
 namespace {

diff --git a/base/threading/platform_thread.h b/base/threading/platform_thread.h
@@ -17,7 +17,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include "base/win/windows_types.h"
 #elif defined(OS_MACOSX)
 #include <mach/mach_types.h>
 #elif defined(OS_FUCHSIA)

diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
@@ -16,6 +16,8 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_handle.h"
 
+#include <windows.h>
+
 namespace base {
 
 namespace {

diff --git a/base/threading/thread_local_storage.h b/base/threading/thread_local_storage.h
@@ -13,7 +13,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include <windows.h>
+#include "base/win/windows_types.h"
 #elif defined(OS_POSIX)
 #include <pthread.h>
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ @@
     #endif
     #if defined(OS_WIN)
+    #include <windows.h>
     #include "base/win/windows_version.h"
     #endif
@@ Expand Down @@