Skip to content

Commit 6ba90a6

Browse files
authored
Retain platform-specific timestamp field that are being added in bug 1961012. (#5446)
1 parent 723b514 commit 6ba90a6

File tree

5 files changed

+33
-0
lines changed

5 files changed

+33
-0
lines changed

src/profile-logic/process-profile.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,12 @@ export function processGeckoProfile(geckoProfile: GeckoProfile): Profile {
16971697
const meta: ProfileMeta = {
16981698
interval: geckoProfile.meta.interval,
16991699
startTime: geckoProfile.meta.startTime,
1700+
startTimeAsClockMonotonicNanosecondsSinceBoot:
1701+
geckoProfile.meta.startTimeAsClockMonotonicNanosecondsSinceBoot,
1702+
startTimeAsMachAbsoluteTimeNanoseconds:
1703+
geckoProfile.meta.startTimeAsMachAbsoluteTimeNanoseconds,
1704+
startTimeAsQueryPerformanceCounterValue:
1705+
geckoProfile.meta.startTimeAsQueryPerformanceCounterValue,
17001706
abi: geckoProfile.meta.abi,
17011707
extensions: extensions,
17021708
misc: geckoProfile.meta.misc,

src/test/unit/__snapshots__/profile-conversion.test.js.snap

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,9 @@ Object {
563563
"sourceURL": undefined,
564564
"stackwalk": 1,
565565
"startTime": 0,
566+
"startTimeAsClockMonotonicNanosecondsSinceBoot": undefined,
567+
"startTimeAsMachAbsoluteTimeNanoseconds": undefined,
568+
"startTimeAsQueryPerformanceCounterValue": undefined,
566569
"symbolicated": true,
567570
"toolkit": undefined,
568571
"updateChannel": undefined,
@@ -86311,6 +86314,9 @@ Object {
8631186314
"sourceURL": undefined,
8631286315
"stackwalk": 1,
8631386316
"startTime": 0,
86317+
"startTimeAsClockMonotonicNanosecondsSinceBoot": undefined,
86318+
"startTimeAsMachAbsoluteTimeNanoseconds": undefined,
86319+
"startTimeAsQueryPerformanceCounterValue": undefined,
8631486320
"symbolicated": true,
8631586321
"toolkit": undefined,
8631686322
"updateChannel": undefined,
@@ -449906,6 +449912,9 @@ Object {
449906449912
"sourceURL": undefined,
449907449913
"stackwalk": 1,
449908449914
"startTime": 2574592839.818,
449915+
"startTimeAsClockMonotonicNanosecondsSinceBoot": undefined,
449916+
"startTimeAsMachAbsoluteTimeNanoseconds": undefined,
449917+
"startTimeAsQueryPerformanceCounterValue": undefined,
449909449918
"symbolicated": true,
449910449919
"toolkit": undefined,
449911449920
"updateChannel": undefined,
@@ -456166,6 +456175,9 @@ Object {
456166456175
"sourceURL": undefined,
456167456176
"stackwalk": 1,
456168456177
"startTime": 2782992.2430000002,
456178+
"startTimeAsClockMonotonicNanosecondsSinceBoot": undefined,
456179+
"startTimeAsMachAbsoluteTimeNanoseconds": undefined,
456180+
"startTimeAsQueryPerformanceCounterValue": undefined,
456169456181
"symbolicated": true,
456170456182
"toolkit": undefined,
456171456183
"updateChannel": undefined,
@@ -471051,6 +471063,9 @@ Object {
471051471063
"sourceURL": undefined,
471052471064
"stackwalk": 1,
471053471065
"startTime": 36556170.907,
471066+
"startTimeAsClockMonotonicNanosecondsSinceBoot": undefined,
471067+
"startTimeAsMachAbsoluteTimeNanoseconds": undefined,
471068+
"startTimeAsQueryPerformanceCounterValue": undefined,
471054471069
"symbolicated": true,
471055471070
"toolkit": undefined,
471056471071
"updateChannel": undefined,
@@ -477245,6 +477260,9 @@ Object {
477245477260
"sourceURL": undefined,
477246477261
"stackwalk": 1,
477247477262
"startTime": 115539936.601,
477263+
"startTimeAsClockMonotonicNanosecondsSinceBoot": undefined,
477264+
"startTimeAsMachAbsoluteTimeNanoseconds": undefined,
477265+
"startTimeAsQueryPerformanceCounterValue": undefined,
477248477266
"symbolicated": true,
477249477267
"toolkit": undefined,
477250477268
"updateChannel": undefined,

src/test/unit/__snapshots__/profile-upgrading.test.js.snap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ Object {
4747
"sourceURL": undefined,
4848
"stackwalk": 1,
4949
"startTime": 2574592839.818,
50+
"startTimeAsClockMonotonicNanosecondsSinceBoot": undefined,
51+
"startTimeAsMachAbsoluteTimeNanoseconds": undefined,
52+
"startTimeAsQueryPerformanceCounterValue": undefined,
5053
"symbolicated": true,
5154
"toolkit": undefined,
5255
"updateChannel": undefined,

src/types/gecko-profile.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,9 @@ export type GeckoProfileShortMeta = {|
405405
// When the main process started. Timestamp expressed in milliseconds since
406406
// midnight January 1, 1970 GMT.
407407
startTime: Milliseconds,
408+
startTimeAsClockMonotonicNanosecondsSinceBoot?: number,
409+
startTimeAsMachAbsoluteTimeNanoseconds?: number,
410+
startTimeAsQueryPerformanceCounterValue?: number,
408411
shutdownTime: Milliseconds | null,
409412
categories: CategoryList,
410413
markerSchema: GeckoMetaMarkerSchema[],

src/types/profile.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,9 @@ export type ProfileMeta = {|
768768
// When the main process started. Timestamp expressed in milliseconds since
769769
// midnight January 1, 1970 GMT.
770770
startTime: Milliseconds,
771+
startTimeAsClockMonotonicNanosecondsSinceBoot?: number,
772+
startTimeAsMachAbsoluteTimeNanoseconds?: number,
773+
startTimeAsQueryPerformanceCounterValue?: number,
771774
// The number of milliseconds since midnight January 1, 1970 GMT.
772775
endTime?: Milliseconds,
773776
// When the recording started (in milliseconds after startTime).

0 commit comments

Comments
 (0)