Skip to content

Commit

Permalink
Back out "Clean up uneeded "duration" parameter from the Performance.…
Browse files Browse the repository at this point in the history 
…mark API"

Summary:
Changelog: [Internal]

Original commit changeset: ce3d14940124

Original Phabricator Diff: D45141978

Reviewed By: GijsWeterings

Differential Revision: D45161958

fbshipit-source-id: 22d79e8e8d0670fd220391f7e5ea92ca257ff982
  • Loading branch information
@makovkastar @facebook-github-bot
makovkastar authored and facebook-github-bot committed Apr 20, 2023
1 parent d77798b commit 9e0d198
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 47 deletions.
5 changes: 3 additions & 2 deletions packages/react-native/Libraries/WebPerformance/NativePerformance.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ NativePerformance::NativePerformance(std::shared_ptr<CallInvoker> jsInvoker)
void NativePerformance::mark(
jsi::Runtime &rt,
std::string name,
double startTime) {
PerformanceEntryReporter::getInstance().mark(name, startTime);
double startTime,
double duration) {
PerformanceEntryReporter::getInstance().mark(name, startTime, duration);
}

void NativePerformance::measure(
Expand Down
3 changes: 2 additions & 1 deletion packages/react-native/Libraries/WebPerformance/NativePerformance.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class NativePerformance : public NativePerformanceCxxSpec<NativePerformance>,
public:
NativePerformance(std::shared_ptr<CallInvoker> jsInvoker);

void mark(jsi::Runtime &rt, std::string name, double startTime);
void
mark(jsi::Runtime &rt, std::string name, double startTime, double duration);

void measure(
jsi::Runtime &rt,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/Libraries/WebPerformance/NativePerformance.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export type ReactNativeStartupTiming = {|
|};

export interface Spec extends TurboModule {
+mark: (name: string, startTime: number) => void;
+mark: (name: string, startTime: number, duration: number) => void;
+measure: (
name: string,
startTime: number,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/Libraries/WebPerformance/Performance.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ export default class Performance {
const mark = new PerformanceMark(markName, markOptions);

if (NativePerformance?.mark) {
NativePerformance.mark(markName, mark.startTime);
NativePerformance.mark(markName, mark.startTime, mark.duration);
} else {
warnNoNativePerformance();
}
Expand Down
17 changes: 7 additions & 10 deletions packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
namespace facebook::react {
EventTag PerformanceEntryReporter::sCurrentEventTag_{0};

static inline double getCurrentTimeStamp() {
return JSExecutor::performanceNow();
}

PerformanceEntryReporter &PerformanceEntryReporter::getInstance() {
static PerformanceEntryReporter instance;
return instance;
Expand Down Expand Up @@ -138,12 +134,13 @@ void PerformanceEntryReporter::logEntry(const RawPerformanceEntry &entry) {

void PerformanceEntryReporter::mark(
const std::string &name,
const std::optional<double> &startTime) {
double startTime,
double duration) {
logEntry(RawPerformanceEntry{
name,
static_cast<int>(PerformanceEntryType::MARK),
startTime ? *startTime : getCurrentTimeStamp(),
0.0,
startTime,
duration,
std::nullopt,
std::nullopt,
std::nullopt});
Expand Down Expand Up @@ -355,7 +352,7 @@ EventTag PerformanceEntryReporter::onEventStart(const char *name) {
sCurrentEventTag_ = 1;
}

auto timeStamp = getCurrentTimeStamp();
auto timeStamp = JSExecutor::performanceNow();
{
std::lock_guard<std::mutex> lock(eventsInFlightMutex_);
eventsInFlight_.emplace(std::make_pair(
Expand All @@ -368,7 +365,7 @@ void PerformanceEntryReporter::onEventDispatch(EventTag tag) {
if (!isReporting(PerformanceEntryType::EVENT) || tag == 0) {
return;
}
auto timeStamp = getCurrentTimeStamp();
auto timeStamp = JSExecutor::performanceNow();
{
std::lock_guard<std::mutex> lock(eventsInFlightMutex_);
auto it = eventsInFlight_.find(tag);
Expand All @@ -382,7 +379,7 @@ void PerformanceEntryReporter::onEventEnd(EventTag tag) {
if (!isReporting(PerformanceEntryType::EVENT) || tag == 0) {
return;
}
auto timeStamp = getCurrentTimeStamp();
auto timeStamp = JSExecutor::performanceNow();
{
std::lock_guard<std::mutex> lock(eventsInFlightMutex_);
auto it = eventsInFlight_.find(tag);
Expand Down
4 changes: 1 addition & 3 deletions packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ class PerformanceEntryReporter : public EventLogger {
return droppedEntryCount_;
}

void mark(
const std::string &name,
const std::optional<double> &startTime = std::nullopt);
void mark(const std::string &name, double startTime, double duration);

void measure(
const std::string &name,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/Libraries/WebPerformance/__mocks__/NativePerformance.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import {RawPerformanceEntryTypeValues} from '../RawPerformanceEntry';
const marks: Map<string, number> = new Map();

const NativePerformanceMock: NativePerformance = {
mark: (name: string, startTime: number): void => {
mark: (name: string, startTime: number, duration: number): void => {
NativePerformanceObserver?.logRawEntry({
name,
entryType: RawPerformanceEntryTypeValues.MARK,
startTime,
duration: 0,
duration,
});
marks.set(name, startTime);
},
Expand Down
54 changes: 27 additions & 27 deletions packages/react-native/Libraries/WebPerformance/__tests__/PerformanceEntryReporterTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestStopReporting) {

reporter.startReporting(PerformanceEntryType::MARK);

reporter.mark("mark0", 0.0);
reporter.mark("mark1", 0.0);
reporter.mark("mark2", 0.0);
reporter.mark("mark0", 0.0, 0.0);
reporter.mark("mark1", 0.0, 0.0);
reporter.mark("mark2", 0.0, 0.0);
reporter.measure("measure0", 0.0, 0.0);

auto res = reporter.popPendingEntries();
Expand All @@ -73,7 +73,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestStopReporting) {
reporter.stopReporting(PerformanceEntryType::MARK);
reporter.startReporting(PerformanceEntryType::MEASURE);

reporter.mark("mark3");
reporter.mark("mark3", 0.0, 0.0);
reporter.measure("measure1", 0.0, 0.0);

res = reporter.popPendingEntries();
Expand All @@ -91,9 +91,9 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMarks) {

reporter.startReporting(PerformanceEntryType::MARK);

reporter.mark("mark0", 0.0);
reporter.mark("mark1", 1.0);
reporter.mark("mark2", 2.0);
reporter.mark("mark0", 0.0, 1.0);
reporter.mark("mark1", 1.0, 3.0);
reporter.mark("mark2", 2.0, 4.0);

auto res = reporter.popPendingEntries();
const auto &entries = res.entries;
Expand All @@ -105,21 +105,21 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMarks) {
{"mark0",
static_cast<int>(PerformanceEntryType::MARK),
0.0,
0.0,
1.0,
std::nullopt,
std::nullopt,
std::nullopt},
{"mark1",
static_cast<int>(PerformanceEntryType::MARK),
1.0,
0.0,
3.0,
std::nullopt,
std::nullopt,
std::nullopt},
{"mark2",
static_cast<int>(PerformanceEntryType::MARK),
2.0,
0.0,
4.0,
std::nullopt,
std::nullopt,
std::nullopt}};
Expand All @@ -136,9 +136,9 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) {
reporter.startReporting(PerformanceEntryType::MARK);
reporter.startReporting(PerformanceEntryType::MEASURE);

reporter.mark("mark0", 0.0);
reporter.mark("mark1", 1.0);
reporter.mark("mark2", 2.0);
reporter.mark("mark0", 0.0, 1.0);
reporter.mark("mark1", 1.0, 3.0);
reporter.mark("mark2", 2.0, 4.0);

reporter.measure("measure0", 0.0, 2.0);
reporter.measure("measure1", 0.0, 2.0, 4.0);
Expand All @@ -155,7 +155,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) {
{"mark0",
static_cast<int>(PerformanceEntryType::MARK),
0.0,
0.0,
1.0,
std::nullopt,
std::nullopt,
std::nullopt},
Expand All @@ -173,17 +173,17 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) {
std::nullopt,
std::nullopt,
std::nullopt},
{"mark1",
static_cast<int>(PerformanceEntryType::MARK),
{"measure2",
static_cast<int>(PerformanceEntryType::MEASURE),
1.0,
1.0,
0.0,
std::nullopt,
std::nullopt,
std::nullopt},
{"measure2",
static_cast<int>(PerformanceEntryType::MEASURE),
1.0,
{"mark1",
static_cast<int>(PerformanceEntryType::MARK),
1.0,
3.0,
std::nullopt,
std::nullopt,
std::nullopt},
Expand All @@ -204,7 +204,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) {
{"mark2",
static_cast<int>(PerformanceEntryType::MARK),
2.0,
0.0,
4.0,
std::nullopt,
std::nullopt,
std::nullopt}};
Expand Down Expand Up @@ -249,9 +249,9 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestGetEntries) {
reporter.startReporting(PerformanceEntryType::MARK);
reporter.startReporting(PerformanceEntryType::MEASURE);

reporter.mark("common_name", 0.0);
reporter.mark("mark1", 1.0);
reporter.mark("mark2", 2.0);
reporter.mark("common_name", 0.0, 1.0);
reporter.mark("mark1", 1.0, 3.0);
reporter.mark("mark2", 2.0, 4.0);

reporter.measure("common_name", 0.0, 2.0);
reporter.measure("measure1", 0.0, 2.0, 4.0);
Expand Down Expand Up @@ -296,9 +296,9 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestClearEntries) {
reporter.startReporting(PerformanceEntryType::MARK);
reporter.startReporting(PerformanceEntryType::MEASURE);

reporter.mark("common_name", 0.0);
reporter.mark("mark1", 1.0);
reporter.mark("mark2", 2.0);
reporter.mark("common_name", 0.0, 1.0);
reporter.mark("mark1", 1.0, 3.0);
reporter.mark("mark2", 2.0, 4.0);

reporter.measure("common_name", 0.0, 2.0);
reporter.measure("measure1", 0.0, 2.0, 4.0);
Expand Down

0 comments on commit 9e0d198

Please sign in to comment.