From 89b1bc0656c72e6d3cce565da8b6f83e8411a28f Mon Sep 17 00:00:00 2001 From: Kean Mariotti Date: Wed, 18 Jan 2023 16:00:42 +0000 Subject: [PATCH] Generate real timestamp for WM dumps Fix: b/265941075 Test: npm run build:all && npm run test:all Change-Id: Icee5428d95e3db58c23aa4b731bc973da6d3ee94 --- tools/winscope/src/parsers/parser_window_manager_dump.ts | 8 +++++--- .../src/parsers/parser_window_manager_dump_test.ts | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/winscope/src/parsers/parser_window_manager_dump.ts b/tools/winscope/src/parsers/parser_window_manager_dump.ts index 7c388a28b..f81a50d16 100644 --- a/tools/winscope/src/parsers/parser_window_manager_dump.ts +++ b/tools/winscope/src/parsers/parser_window_manager_dump.ts @@ -48,10 +48,12 @@ class ParserWindowManagerDump extends Parser { } override getTimestamp(type: TimestampType, entryProto: any): undefined | Timestamp { - if (type !== TimestampType.ELAPSED) { - return undefined; + if (type === TimestampType.ELAPSED) { + return new Timestamp(TimestampType.ELAPSED, 0n); + } else if (type === TimestampType.REAL) { + return new Timestamp(TimestampType.REAL, 0n); } - return new Timestamp(TimestampType.ELAPSED, 0n); + return undefined; } override processDecodedEntry( diff --git a/tools/winscope/src/parsers/parser_window_manager_dump_test.ts b/tools/winscope/src/parsers/parser_window_manager_dump_test.ts index 16da855c2..d33f93f0e 100644 --- a/tools/winscope/src/parsers/parser_window_manager_dump_test.ts +++ b/tools/winscope/src/parsers/parser_window_manager_dump_test.ts @@ -35,8 +35,9 @@ describe('ParserWindowManagerDump', () => { expect(parser.getTimestamps(TimestampType.ELAPSED)).toEqual(expected); }); - it("doesn't provide real timestamp (never)", () => { - expect(parser.getTimestamps(TimestampType.REAL)).toEqual(undefined); + it('provides real timestamp (always zero)', () => { + const expected = [new Timestamp(TimestampType.REAL, 0n)]; + expect(parser.getTimestamps(TimestampType.REAL)).toEqual(expected); }); it('retrieves trace entry from elapsed timestamp', () => {