Merge pull request #270 from vlkale/perfetto-fix-chk

[WIP] Prevent perfetto-connector from breaking Kokkos Tools CI
kokkos · Sep 5, 2024 · a9453b2 · a9453b2
2 parents 7604355 + b9004c0
commit a9453b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 25 deletions.
diff --git a/profiling/perfetto-connector/perfetto/perfetto.cc b/profiling/perfetto-connector/perfetto/perfetto.cc
@@ -49830,7 +49830,7 @@ constexpr uint8_t kChunkNeedsPatching =
 }  // namespace.
 
 constexpr size_t TraceBuffer::ChunkRecord::kMaxSize;
-constexpr size_t TraceBuffer::InlineChunkHeaderSize = sizeof(ChunkRecord);
+const size_t TraceBuffer::InlineChunkHeaderSize = sizeof(ChunkRecord);
 
 // static
 std::unique_ptr<TraceBuffer> TraceBuffer::Create(size_t size_in_bytes,

diff --git a/profiling/perfetto-connector/perfetto/perfetto.h b/profiling/perfetto-connector/perfetto/perfetto.h
@@ -6318,7 +6318,16 @@ enum TraceConfig_LockdownModeOperation : int;
 enum TraceConfig_CompressionType : int;
 enum TraceConfig_StatsdLogging : int;
 enum TraceConfig_TriggerConfig_TriggerMode : int;
-enum BuiltinClock : int;
+enum BuiltinClock : int {
+  BUILTIN_CLOCK_UNKNOWN = 0,
+  BUILTIN_CLOCK_REALTIME = 1,
+  BUILTIN_CLOCK_REALTIME_COARSE = 2,
+  BUILTIN_CLOCK_MONOTONIC = 3,
+  BUILTIN_CLOCK_MONOTONIC_COARSE = 4,
+  BUILTIN_CLOCK_MONOTONIC_RAW = 5,
+  BUILTIN_CLOCK_BOOTTIME = 6,
+  BUILTIN_CLOCK_MAX_ID = 63,
+};
 enum DataSourceConfig_SessionInitiator : int;
 enum ChromeConfig_ClientPriority : int;
 enum TraceConfig_BufferConfig_FillPolicy : int;
@@ -19744,34 +19753,11 @@ enum AndroidLogPriority : int {
 // gen_amalgamated expanded: #include "perfetto/protozero/copyable_ptr.h"
 // gen_amalgamated expanded: #include "perfetto/base/export.h"
 
-namespace perfetto {
-namespace protos {
-namespace gen {
-enum BuiltinClock : int;
-}  // namespace perfetto
-}  // namespace protos
-}  // namespace gen
 
 namespace protozero {
 class Message;
 }  // namespace protozero
 
-namespace perfetto {
-namespace protos {
-namespace gen {
-enum BuiltinClock : int {
-  BUILTIN_CLOCK_UNKNOWN = 0,
-  BUILTIN_CLOCK_REALTIME = 1,
-  BUILTIN_CLOCK_REALTIME_COARSE = 2,
-  BUILTIN_CLOCK_MONOTONIC = 3,
-  BUILTIN_CLOCK_MONOTONIC_COARSE = 4,
-  BUILTIN_CLOCK_MONOTONIC_RAW = 5,
-  BUILTIN_CLOCK_BOOTTIME = 6,
-  BUILTIN_CLOCK_MAX_ID = 63,
-};
-}  // namespace perfetto
-}  // namespace protos
-}  // namespace gen
 
 #endif  // PERFETTO_PROTOS_PROTOS_PERFETTO_COMMON_BUILTIN_CLOCK_PROTO_CPP_H_
 // gen_amalgamated begin header: gen/protos/perfetto/common/commit_data_request.gen.h