Switch to standard integer types in base/trace_event/.

BUG=138542 TBR=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1546033002 Cr-Commit-Position: refs/heads/master@{#366798}
cbchan · Dec 24, 2015 · bd1ed05 · bd1ed05
1 parent df8474b
commit bd1ed05
Show file tree

Hide file tree

Showing 58 changed files with 224 additions and 102 deletions.
diff --git a/base/trace_event/heap_profiler_allocation_context.h b/base/trace_event/heap_profiler_allocation_context.h
@@ -5,6 +5,7 @@
 #ifndef BASE_TRACE_EVENT_HEAP_PROFILER_ALLOCATION_CONTEXT_H_
 #define BASE_TRACE_EVENT_HEAP_PROFILER_ALLOCATION_CONTEXT_H_
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include "base/base_export.h"

diff --git a/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc b/base/trace_event/heap_profiler_allocation_context_tracker_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <iterator>
 
 #include "base/memory/ref_counted.h"

diff --git a/base/trace_event/heap_profiler_allocation_register.h b/base/trace_event/heap_profiler_allocation_register.h
@@ -5,6 +5,7 @@
 #ifndef BASE_TRACE_EVENT_HEAP_PROFILER_ALLOCATION_REGISTER_H_
 #define BASE_TRACE_EVENT_HEAP_PROFILER_ALLOCATION_REGISTER_H_
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include "base/logging.h"

diff --git a/base/trace_event/heap_profiler_allocation_register_posix.cc b/base/trace_event/heap_profiler_allocation_register_posix.cc
@@ -4,10 +4,10 @@
 
 #include "base/trace_event/heap_profiler_allocation_register.h"
 
+#include <stddef.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "base/basictypes.h"
 #include "base/bits.h"
 #include "base/logging.h"
 #include "base/process/process_metrics.h"

diff --git a/base/trace_event/heap_profiler_allocation_register_unittest.cc b/base/trace_event/heap_profiler_allocation_register_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "base/trace_event/heap_profiler_allocation_register.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/process/process_metrics.h"
 #include "base/trace_event/heap_profiler_allocation_context.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/base/trace_event/heap_profiler_allocation_register_win.cc b/base/trace_event/heap_profiler_allocation_register_win.cc
@@ -5,6 +5,7 @@
 #include "base/trace_event/heap_profiler_allocation_register.h"
 
 #include <windows.h>
+#include <stddef.h>
 
 #include "base/bits.h"
 #include "base/logging.h"

diff --git a/base/trace_event/heap_profiler_heap_dump_writer.cc b/base/trace_event/heap_profiler_heap_dump_writer.cc
@@ -4,6 +4,8 @@
 
 #include "base/trace_event/heap_profiler_heap_dump_writer.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <iterator>
 #include <tuple>
@@ -12,6 +14,7 @@
 
 #include "base/format_macros.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/heap_profiler_stack_frame_deduplicator.h"
 #include "base/trace_event/heap_profiler_type_name_deduplicator.h"

diff --git a/base/trace_event/heap_profiler_heap_dump_writer.h b/base/trace_event/heap_profiler_heap_dump_writer.h
@@ -5,6 +5,8 @@
 #ifndef BASE_TRACE_EVENT_HEAP_PROFILER_HEAP_DUMP_WRITER_H_
 #define BASE_TRACE_EVENT_HEAP_PROFILER_HEAP_DUMP_WRITER_H_
 
+#include <stddef.h>
+
 #include <set>
 
 #include "base/base_export.h"

diff --git a/base/trace_event/heap_profiler_heap_dump_writer_unittest.cc b/base/trace_event/heap_profiler_heap_dump_writer_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <set>
 #include <string>
 

diff --git a/base/trace_event/heap_profiler_stack_frame_deduplicator.cc b/base/trace_event/heap_profiler_stack_frame_deduplicator.cc
@@ -4,6 +4,8 @@
 
 #include "base/trace_event/heap_profiler_stack_frame_deduplicator.h"
 
+#include <stddef.h>
+
 #include <string>
 #include <utility>
 

diff --git a/base/trace_event/heap_profiler_type_name_deduplicator.cc b/base/trace_event/heap_profiler_type_name_deduplicator.cc
@@ -4,6 +4,7 @@
 
 #include "base/trace_event/heap_profiler_type_name_deduplicator.h"
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <string>
 #include <utility>

diff --git a/base/trace_event/java_heap_dump_provider_android.h b/base/trace_event/java_heap_dump_provider_android.h
@@ -5,6 +5,7 @@
 #ifndef BASE_TRACE_EVENT_JAVA_HEAP_DUMP_PROVIDER_ANDROID_H_
 #define BASE_TRACE_EVENT_JAVA_HEAP_DUMP_PROVIDER_ANDROID_H_
 
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/trace_event/memory_dump_provider.h"
 

diff --git a/base/trace_event/malloc_dump_provider.cc b/base/trace_event/malloc_dump_provider.cc
@@ -4,15 +4,18 @@
 
 #include "base/trace_event/malloc_dump_provider.h"
 
+#include <stddef.h>
+
+#include "base/allocator/allocator_extension.h"
+#include "base/trace_event/process_memory_dump.h"
+#include "build/build_config.h"
+
 #if defined(OS_MACOSX)
 #include <malloc/malloc.h>
 #else
 #include <malloc.h>
 #endif
 
-#include "base/allocator/allocator_extension.h"
-#include "base/trace_event/process_memory_dump.h"
-
 namespace base {
 namespace trace_event {
 

diff --git a/base/trace_event/memory_allocator_dump.cc b/base/trace_event/memory_allocator_dump.cc
@@ -57,7 +57,7 @@ MemoryAllocatorDump::~MemoryAllocatorDump() {
 
 void MemoryAllocatorDump::AddScalar(const char* name,
                                     const char* units,
-                                    uint64 value) {
+                                    uint64_t value) {
   SStringPrintf(&string_conversion_buffer_, "%" PRIx64, value);
   attributes_->BeginDictionary(name);
   attributes_->SetString("type", kTypeScalar);

diff --git a/base/trace_event/memory_allocator_dump.h b/base/trace_event/memory_allocator_dump.h
@@ -5,11 +5,13 @@
 #ifndef BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_H_
 #define BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/base_export.h"
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/trace_event/memory_allocator_dump_guid.h"
 #include "base/values.h"
@@ -51,7 +53,7 @@ class BASE_EXPORT MemoryAllocatorDump {
   //    AddScalar("number_of_freelist_entires", kUnitsObjects, 42)
   // - Other informational column (will not be auto-added in the UI)
   //    AddScalarF("kittens_ratio", "ratio", 42.0f)
-  void AddScalar(const char* name, const char* units, uint64 value);
+  void AddScalar(const char* name, const char* units, uint64_t value);
   void AddScalarF(const char* name, const char* units, double value);
   void AddString(const char* name, const char* units, const std::string& value);
 

diff --git a/base/trace_event/memory_allocator_dump_guid.cc b/base/trace_event/memory_allocator_dump_guid.cc
@@ -12,16 +12,15 @@ namespace base {
 namespace trace_event {
 
 namespace {
-uint64 HashString(const std::string& str) {
-  uint64 hash[(kSHA1Length + sizeof(uint64) - 1) / sizeof(uint64)] = { 0 };
+uint64_t HashString(const std::string& str) {
+  uint64_t hash[(kSHA1Length + sizeof(uint64_t) - 1) / sizeof(uint64_t)] = {0};
   SHA1HashBytes(reinterpret_cast<const unsigned char*>(str.data()), str.size(),
                 reinterpret_cast<unsigned char*>(hash));
   return hash[0];
 }
 }  // namespace
 
-MemoryAllocatorDumpGuid::MemoryAllocatorDumpGuid(uint64 guid) : guid_(guid) {
-}
+MemoryAllocatorDumpGuid::MemoryAllocatorDumpGuid(uint64_t guid) : guid_(guid) {}
 
 MemoryAllocatorDumpGuid::MemoryAllocatorDumpGuid()
     : MemoryAllocatorDumpGuid(0u) {

diff --git a/base/trace_event/memory_allocator_dump_guid.h b/base/trace_event/memory_allocator_dump_guid.h
@@ -5,25 +5,26 @@
 #ifndef BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_GUID_H_
 #define BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_GUID_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/base_export.h"
-#include "base/basictypes.h"
 
 namespace base {
 namespace trace_event {
 
 class BASE_EXPORT MemoryAllocatorDumpGuid {
  public:
   MemoryAllocatorDumpGuid();
-  explicit MemoryAllocatorDumpGuid(uint64 guid);
+  explicit MemoryAllocatorDumpGuid(uint64_t guid);
 
   // Utility ctor to hash a GUID if the caller prefers a string. The caller
   // still has to ensure that |guid_str| is unique, per snapshot, within the
   // global scope of all the traced processes.
   explicit MemoryAllocatorDumpGuid(const std::string& guid_str);
 
-  uint64 ToUint64() const { return guid_; }
+  uint64_t ToUint64() const { return guid_; }
 
   // Returns a (hex-encoded) string representation of the guid.
   std::string ToString() const;
@@ -39,7 +40,7 @@ class BASE_EXPORT MemoryAllocatorDumpGuid {
   }
 
  private:
-  uint64 guid_;
+  uint64_t guid_;
 
   // Deliberately copy-able.
 };

diff --git a/base/trace_event/memory_allocator_dump_unittest.cc b/base/trace_event/memory_allocator_dump_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "base/trace_event/memory_allocator_dump.h"
 
+#include <stdint.h>
+
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/memory_allocator_dump_guid.h"
@@ -12,6 +14,7 @@
 #include "base/trace_event/process_memory_dump.h"
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -82,7 +85,7 @@ void CheckString(const MemoryAllocatorDump* dump,
 void CheckScalar(const MemoryAllocatorDump* dump,
                  const std::string& name,
                  const char* expected_units,
-                 uint64 expected_value) {
+                 uint64_t expected_value) {
   CheckString(dump, name, MemoryAllocatorDump::kTypeScalar, expected_units,
               StringPrintf("%" PRIx64, expected_value));
 }

diff --git a/base/trace_event/memory_dump_manager.h b/base/trace_event/memory_dump_manager.h
@@ -5,13 +5,16 @@
 #ifndef BASE_TRACE_EVENT_MEMORY_DUMP_MANAGER_H_
 #define BASE_TRACE_EVENT_MEMORY_DUMP_MANAGER_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "base/atomicops.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"

diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "base/trace_event/memory_dump_manager.h"
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/bind_helpers.h"
@@ -83,7 +85,7 @@ class MemoryDumpManagerDelegateForTesting : public MemoryDumpManagerDelegate {
                void(const MemoryDumpRequestArgs& args,
                     const MemoryDumpCallback& callback));
 
-  uint64 GetTracingProcessId() const override {
+  uint64_t GetTracingProcessId() const override {
     NOTREACHED();
     return MemoryDumpManager::kInvalidTracingProcessId;
   }
@@ -120,7 +122,7 @@ class MemoryDumpManagerTest : public testing::Test {
   // result and taking care of posting the closure on the correct task runner.
   void DumpCallbackAdapter(scoped_refptr<SingleThreadTaskRunner> task_runner,
                            Closure closure,
-                           uint64 dump_guid,
+                           uint64_t dump_guid,
                            bool success) {
     last_callback_success_ = success;
     task_runner->PostTask(FROM_HERE, closure);
@@ -373,15 +375,15 @@ TEST_F(MemoryDumpManagerTest, RegistrationConsistency) {
 // iteration, one thread is removed, to check the live unregistration logic.
 TEST_F(MemoryDumpManagerTest, RespectTaskRunnerAffinity) {
   InitializeMemoryDumpManager(false /* is_coordinator */);
-  const uint32 kNumInitialThreads = 8;
+  const uint32_t kNumInitialThreads = 8;
 
   std::vector<scoped_ptr<Thread>> threads;
   std::vector<scoped_ptr<MockMemoryDumpProvider>> mdps;
 
   // Create the threads and setup the expectations. Given that at each iteration
   // we will pop out one thread/MemoryDumpProvider, each MDP is supposed to be
   // invoked a number of times equal to its index.
-  for (uint32 i = kNumInitialThreads; i > 0; --i) {
+  for (uint32_t i = kNumInitialThreads; i > 0; --i) {
     threads.push_back(make_scoped_ptr(new Thread("test thread")));
     auto thread = threads.back().get();
     thread->Start();

diff --git a/base/trace_event/process_memory_dump.cc b/base/trace_event/process_memory_dump.cc
@@ -10,6 +10,7 @@
 #include "base/process/process_metrics.h"
 #include "base/trace_event/process_memory_totals.h"
 #include "base/trace_event/trace_event_argument.h"
+#include "build/build_config.h"
 
 #if defined(OS_POSIX)
 #include <sys/mman.h>

diff --git a/base/trace_event/process_memory_dump.h b/base/trace_event/process_memory_dump.h
@@ -5,18 +5,22 @@
 #ifndef BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
 #define BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
 
+#include <stddef.h>
+
 #include <vector>
 
 #include "base/base_export.h"
 #include "base/containers/hash_tables.h"
 #include "base/containers/small_map.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/trace_event/memory_allocator_dump.h"
 #include "base/trace_event/memory_allocator_dump_guid.h"
 #include "base/trace_event/memory_dump_session_state.h"
 #include "base/trace_event/process_memory_maps.h"
 #include "base/trace_event/process_memory_totals.h"
+#include "build/build_config.h"
 
 // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
 // resident memory.

diff --git a/base/trace_event/process_memory_dump_unittest.cc b/base/trace_event/process_memory_dump_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "base/trace_event/process_memory_dump.h"
 
+#include <stddef.h>
+
 #include "base/memory/aligned_memory.h"
 #include "base/process/process_metrics.h"
 #include "base/trace_event/memory_allocator_dump_guid.h"

diff --git a/base/trace_event/process_memory_maps.cc b/base/trace_event/process_memory_maps.cc
@@ -12,9 +12,9 @@ namespace base {
 namespace trace_event {
 
 // static
-const uint32 ProcessMemoryMaps::VMRegion::kProtectionFlagsRead = 4;
-const uint32 ProcessMemoryMaps::VMRegion::kProtectionFlagsWrite = 2;
-const uint32 ProcessMemoryMaps::VMRegion::kProtectionFlagsExec = 1;
+const uint32_t ProcessMemoryMaps::VMRegion::kProtectionFlagsRead = 4;
+const uint32_t ProcessMemoryMaps::VMRegion::kProtectionFlagsWrite = 2;
+const uint32_t ProcessMemoryMaps::VMRegion::kProtectionFlagsExec = 1;
 
 ProcessMemoryMaps::VMRegion::VMRegion()
     : start_address(0),