From 3de16a54844297fb8b1268716d6a32bca2e660e1 Mon Sep 17 00:00:00 2001
From: klzgrad <kizdiv@gmail.com>
Date: Sat, 29 Aug 2020 20:22:14 +0800
Subject: [PATCH] base: Disable trace event
This allows builds with enable_base_tracing=false.
---
src/base/trace_event/base_tracing_forward.h | 2 +-
src/base/trace_event/memory_allocator_dump.h | 3 ++
src/base/trace_event/memory_dump_manager.h | 3 ++
src/base/trace_event/memory_dump_provider.h | 3 ++
src/base/trace_event/process_memory_dump.h | 3 ++
src/base/trace_event/trace_event.h | 3 ++
src/base/trace_event/trace_event_stub.cc | 4 +++
src/base/trace_event/trace_event_stub.h | 37 ++++++++++++++++++++
src/net/BUILD.gn | 2 --
9 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/src/base/trace_event/base_tracing_forward.h b/src/base/trace_event/base_tracing_forward.h
index f72f9fde2f..bd8fad8126 100644
--- a/src/base/trace_event/base_tracing_forward.h
+++ b/src/base/trace_event/base_tracing_forward.h
@@ -10,7 +10,7 @@
#include "base/tracing_buildflags.h"
-#if BUILDFLAG(ENABLE_BASE_TRACING)
+#if 1
#include "third_party/perfetto/include/perfetto/tracing/traced_value_forward.h" // nogncheck
#else
diff --git a/src/base/trace_event/memory_allocator_dump.h b/src/base/trace_event/memory_allocator_dump.h
index 97799e978e..b585a7cbb2 100644
--- a/src/base/trace_event/memory_allocator_dump.h
+++ b/src/base/trace_event/memory_allocator_dump.h
@@ -5,6 +5,8 @@
#ifndef BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_H_
#define BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_H_
+#include "base/trace_event/trace_event_stub.h"
+#if 0
#include <stdint.h>
#include <iosfwd>
@@ -159,4 +161,5 @@ void BASE_EXPORT PrintTo(const MemoryAllocatorDump::Entry&, std::ostream*);
} // namespace trace_event
} // namespace base
+#endif
#endif // BASE_TRACE_EVENT_MEMORY_ALLOCATOR_DUMP_H_
diff --git a/src/base/trace_event/memory_dump_manager.h b/src/base/trace_event/memory_dump_manager.h
index 1ebb2f8f0c..2c1856d413 100644
--- a/src/base/trace_event/memory_dump_manager.h
+++ b/src/base/trace_event/memory_dump_manager.h
@@ -5,6 +5,8 @@
#ifndef BASE_TRACE_EVENT_MEMORY_DUMP_MANAGER_H_
#define BASE_TRACE_EVENT_MEMORY_DUMP_MANAGER_H_
+#include "base/trace_event/trace_event_stub.h"
+#if 0
#include <stdint.h>
#include <map>
@@ -267,4 +269,5 @@ class BASE_EXPORT MemoryDumpManager {
} // namespace trace_event
} // namespace base
+#endif
#endif // BASE_TRACE_EVENT_MEMORY_DUMP_MANAGER_H_
diff --git a/src/base/trace_event/memory_dump_provider.h b/src/base/trace_event/memory_dump_provider.h
index 983940772c..94d0d7f2a2 100644
--- a/src/base/trace_event/memory_dump_provider.h
+++ b/src/base/trace_event/memory_dump_provider.h
@@ -5,6 +5,8 @@
#ifndef BASE_TRACE_EVENT_MEMORY_DUMP_PROVIDER_H_
#define BASE_TRACE_EVENT_MEMORY_DUMP_PROVIDER_H_
+#include "base/trace_event/trace_event_stub.h"
+#if 0
#include "base/base_export.h"
#include "base/process/process_handle.h"
#include "base/trace_event/memory_dump_request_args.h"
@@ -48,4 +50,5 @@ class BASE_EXPORT MemoryDumpProvider {
} // namespace trace_event
} // namespace base
+#endif
#endif // BASE_TRACE_EVENT_MEMORY_DUMP_PROVIDER_H_
diff --git a/src/base/trace_event/process_memory_dump.h b/src/base/trace_event/process_memory_dump.h
index 31bab50b4c..1cb419e57f 100644
--- a/src/base/trace_event/process_memory_dump.h
+++ b/src/base/trace_event/process_memory_dump.h
@@ -5,6 +5,8 @@
#ifndef BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
#define BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
+#include "base/trace_event/trace_event_stub.h"
+#if 0
#include <stddef.h>
#include <map>
@@ -296,4 +298,5 @@ class BASE_EXPORT ProcessMemoryDump {
} // namespace trace_event
} // namespace base
+#endif
#endif // BASE_TRACE_EVENT_PROCESS_MEMORY_DUMP_H_
diff --git a/src/base/trace_event/trace_event.h b/src/base/trace_event/trace_event.h
index f5282a47d4..9542c7b2b0 100644
--- a/src/base/trace_event/trace_event.h
+++ b/src/base/trace_event/trace_event.h
@@ -5,6 +5,8 @@
#ifndef BASE_TRACE_EVENT_TRACE_EVENT_H_
#define BASE_TRACE_EVENT_TRACE_EVENT_H_
+#include "base/trace_event/trace_event_stub.h"
+#if 0
// This header file defines implementation details of how the trace macros in
// trace_event_common.h collect and store trace events. Anything not
// implementation-specific should go in trace_event_common.h instead of here.
@@ -805,4 +807,5 @@ class TraceScopedTrackableObject {
} // namespace trace_event
} // namespace base
+#endif
#endif // BASE_TRACE_EVENT_TRACE_EVENT_H_
diff --git a/src/base/trace_event/trace_event_stub.cc b/src/base/trace_event/trace_event_stub.cc
index f227101ea4..605a20d9e5 100644
--- a/src/base/trace_event/trace_event_stub.cc
+++ b/src/base/trace_event/trace_event_stub.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "base/trace_event/memory_usage_estimator.h"
#include "base/trace_event/trace_event_stub.h"
namespace base {
@@ -20,6 +21,9 @@ MemoryDumpProvider::~MemoryDumpProvider() = default;
// static
constexpr const char* const MemoryDumpManager::kTraceCategory;
+template size_t EstimateMemoryUsage(const std::string&);
+template size_t EstimateMemoryUsage(const std::u16string&);
+
} // namespace trace_event
} // namespace base
diff --git a/src/base/trace_event/trace_event_stub.h b/src/base/trace_event/trace_event_stub.h
index 500d6b53db..0b2d6f87a3 100644
--- a/src/base/trace_event/trace_event_stub.h
+++ b/src/base/trace_event/trace_event_stub.h
@@ -11,6 +11,8 @@
#include <string>
#include "base/base_export.h"
+#include "base/check.h"
+#include "base/memory/ref_counted.h"
#include "base/strings/string_piece.h"
#include "base/trace_event/common/trace_event_common.h"
#include "base/trace_event/memory_allocator_dump_guid.h"
@@ -172,6 +174,41 @@ class BASE_EXPORT MemoryDumpProvider {
MemoryDumpProvider() = default;
};
+class BASE_EXPORT MemoryAllocatorDump {
+ public:
+ static constexpr char* kNameSize = nullptr;
+ static constexpr char* kNameObjectCount = nullptr;
+ static constexpr char* kUnitsBytes = nullptr;
+ static constexpr char* kUnitsObjects = nullptr;
+ static constexpr char* kTypeScalar = nullptr;
+ static constexpr char* kTypeString = nullptr;
+ void AddScalar(const char* name, const char* units, uint64_t value) {}
+ void AddString(const char* name,
+ const char* units,
+ const std::string& value) {}
+ const std::string& absolute_name() const { return absolute_name_; }
+ const MemoryAllocatorDumpGuid& guid() const { return guid_; }
+
+ private:
+ const std::string absolute_name_;
+ MemoryAllocatorDumpGuid guid_;
+};
+
+class BASE_EXPORT ProcessMemoryDump {
+ public:
+ MemoryAllocatorDump* CreateAllocatorDump(const std::string& absolute_name) {
+ CHECK(false);
+ return nullptr;
+ }
+ MemoryAllocatorDump* GetAllocatorDump(
+ const std::string& absolute_name) const {
+ CHECK(false);
+ return nullptr;
+ }
+ void AddOwnershipEdge(const MemoryAllocatorDumpGuid& source,
+ const MemoryAllocatorDumpGuid& target) {}
+};
+
class BASE_EXPORT MemoryDumpManager {
public:
static constexpr const char* const kTraceCategory =
diff --git a/src/net/BUILD.gn b/src/net/BUILD.gn
index 63c717c288..6664aeab02 100644
--- a/src/net/BUILD.gn
+++ b/src/net/BUILD.gn
@@ -672,8 +672,6 @@ component("net") {
"log/net_log_values.h",
"log/net_log_with_source.cc",
"log/net_log_with_source.h",
- "log/trace_net_log_observer.cc",
- "log/trace_net_log_observer.h",
"nqe/cached_network_quality.cc",
"nqe/cached_network_quality.h",
"nqe/effective_connection_type.cc",