1658230 - Deduplicate ProfileJSONWriter

Status: RESOLVED FIXED

(Core :: Gecko Profiler, task, P2)

Description

[Gerald Squelart (he/him) (not at Mozilla since 2022-09-15)]

We have both "BaseProfileJSONWriter.h" and "ProfileJSONWriter.h" that contain the same code.

Comment 1

[Gerald Squelart (he/him) (not at Mozilla since 2022-09-15)]

Attachment: Bug 1658230 - Make BaseProfileJSONWriter.h header-only - r?canaltinova,gregtatum

Because this header will be used across libraries, it is simpler to make it fully self-contained instead of using MFBT_API.

Comment 2

[Gerald Squelart (he/him) (not at Mozilla since 2022-09-15)]

Attachment: Bug 1658230 - Deduplicate ProfileJSONWriter classes - r?canaltinova,gregtatum

The main change is removing ProfileJSONWriter.cpp, making ProfileJSONWriter.h point at BaseProfileJSONWriter.h, and exposing mozilla::baseprofiler:: classes in the top namespace as expected by users of ProfileJSONWriter.h (to minimize changes).

These two headers are now always present in the "mozilla" include directory, independent of MOZ_GECKO_PROFILER settings.

The rest is just needed tweaks to match the above changes.

Depends on D86503

Comment 3

[Gerald Squelart (he/him) (not at Mozilla since 2022-09-15)]

Attachment: Bug 1658230 - Renamed SpliceableChunkedJSONWriter::WriteFunc to ChunkedWriteFunc - r?canaltinova,gregtatum

SpliceableChunkedJSONWriter::WriteFunc was hiding base-class non-virtual JSONWriter::WriteFunc(), which made it less than ideal (for me) to reason with.

Also made SpliceableChunkedJSONWriter final, to help with possible devirtualization.

Depends on D86504

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/801e1d8c1de0
Make BaseProfileJSONWriter.h header-only - r=gregtatum
https://hg.mozilla.org/integration/autoland/rev/7ae81a4ff37e
Deduplicate ProfileJSONWriter classes - r=gregtatum
https://hg.mozilla.org/integration/autoland/rev/61871a38eb0f
Renamed SpliceableChunkedJSONWriter::WriteFunc to ChunkedWriteFunc - r=gregtatum

Comment 5

[Natalia Csoregi [:nataliaCs]]

https://hg.mozilla.org/mozilla-central/rev/801e1d8c1de0
https://hg.mozilla.org/mozilla-central/rev/7ae81a4ff37e
https://hg.mozilla.org/mozilla-central/rev/61871a38eb0f