From b53aa0867801fc8c579fb57babdbc1bd04e22b32 Mon Sep 17 00:00:00 2001 From: Marlene Cota Date: Tue, 14 May 2024 05:34:37 -0700 Subject: [PATCH] EventPerformanceLogger + BoundedConsumableBuffer - switch members to size_t (#44564) Summary: The RNW integration to RN 04/13 (https://github.com/microsoft/react-native-windows/pull/13226) adds EventPerformanceLogger.cpp and PerformanceEntryReporter.cpp. We're getting the following errors: ![image](https://github.com/facebook/react-native/assets/1422161/33a4dc42-1d14-4ac4-befd-87ec5cd02640) ![image](https://github.com/facebook/react-native/assets/1422161/6269968d-c0e8-489b-992e-0bb41b6ef7c6) Switching to size_t fixes it. ## Changelog: [Internal] [FIXED] - EventPerformanceLogger + BoundedConsumableBuffer - switch members to size_t Pull Request resolved: https://github.com/facebook/react-native/pull/44564 Test Plan: Builds on Windows Reviewed By: fabriziocucci Differential Revision: D57327696 Pulled By: javache fbshipit-source-id: 21ec3a9597958aa70fbca64710bd615a1022292d --- .../timeline/BoundedConsumableBuffer.h | 17 +++++++++-------- .../observers/events/EventPerformanceLogger.cpp | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/react-native/ReactCommon/react/performance/timeline/BoundedConsumableBuffer.h b/packages/react-native/ReactCommon/react/performance/timeline/BoundedConsumableBuffer.h index b1174ea0e3c..8e695012b2a 100644 --- a/packages/react-native/ReactCommon/react/performance/timeline/BoundedConsumableBuffer.h +++ b/packages/react-native/ReactCommon/react/performance/timeline/BoundedConsumableBuffer.h @@ -13,7 +13,7 @@ namespace facebook::react { -constexpr int DEFAULT_MAX_SIZE = 1024; +constexpr size_t DEFAULT_MAX_SIZE = 1024; /** * A container for storing entries of type T, with the following properties: @@ -47,7 +47,8 @@ class BoundedConsumableBuffer { DROP = 2, }; - BoundedConsumableBuffer(int maxSize = DEFAULT_MAX_SIZE) : maxSize_(maxSize) { + BoundedConsumableBuffer(size_t maxSize = DEFAULT_MAX_SIZE) + : maxSize_(maxSize) { entries_.reserve(maxSize_); } @@ -229,18 +230,18 @@ class BoundedConsumableBuffer { private: std::vector entries_; - const int maxSize_; + const size_t maxSize_; // Current starting position in the circular buffer: - int position_{0}; + size_t position_{0}; - // Current "cursor" - positions of the firsst and after last unconsumed + // Current "cursor" - positions of the first and after last unconsumed // element, relative to the starting position: - int cursorStart_{0}; - int cursorEnd_{0}; + size_t cursorStart_{0}; + size_t cursorEnd_{0}; // Number of currently unconsumed elements: - int numToConsume_{0}; + size_t numToConsume_{0}; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp b/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp index 73cf365de41..95e66d16445 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/events/EventPerformanceLogger.cpp @@ -15,7 +15,7 @@ namespace facebook::react { namespace { struct StrKey { - uint32_t key; + size_t key; StrKey(std::string_view s) : key(std::hash{}(s)) {} bool operator==(const StrKey& rhs) const { @@ -25,7 +25,7 @@ struct StrKey { struct StrKeyHash { constexpr size_t operator()(const StrKey& strKey) const { - return static_cast(strKey.key); + return strKey.key; } };