Skip to content

Fix potential race conditions when executing commitHooks#53862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
christophpurrer wants to merge 1 commit into from
Closed

Fix potential race conditions when executing commitHooks #53862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions ...react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,9 +10,39 @@
#include <glog/logging.h>
#include <react/common/mapbuffer/JReadableMapBuffer.h>
#include <react/renderer/imagemanager/conversions.h>
#include <react/renderer/uimanager/UIManagerCommitHook.h>

namespace facebook::react {

class ImageFetcherCommitHook : public UIManagerCommitHook {
public:
explicit ImageFetcherCommitHook(ImageFetcher* fetcher) : fetcher_(fetcher) {}

RootShadowNode::Unshared shadowTreeWillCommit(
const ShadowTree& /*shadowTree*/,
const RootShadowNode::Shared& /*oldRootShadowNode*/,
const RootShadowNode::Unshared& newRootShadowNode,
const ShadowTree::CommitOptions& /*commitOptions*/) noexcept override {
if (fetcher_ != nullptr) {
fetcher_->flushImageRequests();
}
return newRootShadowNode;
}

void commitHookWasRegistered(
const UIManager& /*uiManager*/) noexcept override {}

void commitHookWasUnregistered(
const UIManager& /*uiManager*/) noexcept override {}

void invalidate() {
fetcher_ = nullptr;
}

private:
ImageFetcher* fetcher_;
};

ImageFetcher::ImageFetcher(
std::shared_ptr<const ContextContainer> contextContainer)
: contextContainer_(std::move(contextContainer)) {
Expand All@@ -22,20 +52,24 @@ ImageFetcher::ImageFetcher(
->find<std::shared_ptr<UIManagerCommitHookManager>>(
std::string(UIManagerCommitHookManagerKey));
uiManagerCommitHookManager.has_value()) {
(*uiManagerCommitHookManager)->registerCommitHook(*this);
commitHook_ = std::make_unique<ImageFetcherCommitHook>(this);
(*uiManagerCommitHookManager)->registerCommitHook(*commitHook_);
}
}
}

ImageFetcher::~ImageFetcher() {
if (ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid()) {
if (ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid() &&
commitHook_ != nullptr) {
commitHook_->invalidate();
if (auto uiManagerCommitHookManager =
contextContainer_
->find<std::shared_ptr<UIManagerCommitHookManager>>(
std::string(UIManagerCommitHookManagerKey));
uiManagerCommitHookManager.has_value()) {
(*uiManagerCommitHookManager)->unregisterCommitHook(*this);
(*uiManagerCommitHookManager)->unregisterCommitHook(*commitHook_);
}
commitHook_ = nullptr;
}
}

Expand All@@ -58,15 +92,6 @@ ImageRequest ImageFetcher::requestImage(
return {imageSource, telemetry};
}

RootShadowNode::Unshared ImageFetcher::shadowTreeWillCommit(
const ShadowTree& /*shadowTree*/,
const RootShadowNode::Shared& /*oldRootShadowNode*/,
const RootShadowNode::Unshared& newRootShadowNode,
const ShadowTree::CommitOptions& /*commitOptions*/) noexcept {
flushImageRequests();
return newRootShadowNode;
}

void ImageFetcher::flushImageRequests() {
if (items_.empty()) {
return;
Expand Down
21 changes: 7 additions & 14 deletions ...n/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,17 +11,19 @@
#include <react/renderer/imagemanager/ImageRequest.h>
#include <react/renderer/imagemanager/ImageRequestParams.h>
#include <react/renderer/mounting/ShadowTree.h>
#include <react/renderer/uimanager/UIManagerCommitHook.h>
#include <react/utils/ContextContainer.h>
#include <memory>
#include <unordered_map>
#include <vector>

namespace facebook::react {

class ImageFetcher : public UIManagerCommitHook {
class ImageFetcherCommitHook;

class ImageFetcher {
public:
ImageFetcher(std::shared_ptr<const ContextContainer> contextContainer);
~ImageFetcher() override;
~ImageFetcher();
ImageFetcher(const ImageFetcher&) = delete;
ImageFetcher& operator=(const ImageFetcher&) = delete;
ImageFetcher(ImageFetcher&&) = delete;
Expand All@@ -33,21 +35,12 @@ class ImageFetcher : public UIManagerCommitHook {
const ImageRequestParams& imageRequestParams,
Tag tag);

void commitHookWasRegistered(const UIManager& uiManager) noexcept override {}

void commitHookWasUnregistered(const UIManager& uiManager) noexcept override {
}

RootShadowNode::Unshared shadowTreeWillCommit(
const ShadowTree& shadowTree,
const RootShadowNode::Shared& oldRootShadowNode,
const RootShadowNode::Unshared& newRootShadowNode,
const ShadowTree::CommitOptions& commitOptions) noexcept override;

private:
friend class ImageFetcherCommitHook;
void flushImageRequests();

std::unordered_map<SurfaceId, std::vector<ImageRequestItem>> items_;
std::shared_ptr<const ContextContainer> contextContainer_;
std::unique_ptr<ImageFetcherCommitHook> commitHook_;
};
} // namespace facebook::react
Loading