Asset ImageFetcher thread correctness in DEBUG builds (facebook#54487)

Summary:

Changelog: [Internal]

Reviewed By: lenaic

Differential Revision: D86678354

Author: christophpurrer

packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp

@@ -7,7 +7,10 @@
 
 #include "ImageFetcher.h"
 
+#include <cxxreact/TraceSection.h>
+#include <glog/logging.h>
 #include <react/common/mapbuffer/JReadableMapBuffer.h>
+#include <react/debug/react_native_assert.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/renderer/imagemanager/conversions.h>
 
@@ -17,10 +20,19 @@ extern const char ImageFetcherKey[] = "ImageFetcher";
 
 ImageFetcher::ImageFetcher(
     std::shared_ptr<const ContextContainer> contextContainer)
-    : contextContainer_(std::move(contextContainer)) {}
+    : contextContainer_(std::move(contextContainer))
+#ifdef REACT_NATIVE_DEBUG
+      ,
+      threadId_(std::this_thread::get_id())
+#endif
+{
+}
 
 ImageFetcher::~ImageFetcher() noexcept {
   if (ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid()) {
+#ifdef REACT_NATIVE_DEBUG
+    assertThread();
+#endif
     contextContainer_->erase(ImageFetcherKey);
   }
 }
@@ -30,6 +42,7 @@ ImageRequest ImageFetcher::requestImage(
     SurfaceId surfaceId,
     const ImageRequestParams& imageRequestParams,
     Tag tag) {
+  TraceSection s("ImageFetcher::requestImage");
   items_[surfaceId].emplace_back(
       ImageRequestItem{
           .imageSource = imageSource,
@@ -42,10 +55,24 @@ ImageRequest ImageFetcher::requestImage(
     flushImageRequests();
   }
 
-  return ImageRequest{imageSource, telemetry};
+  auto sharedResumeFunction = SharedFunction<>();
+  auto sharedCancelationFunction = SharedFunction<>();
+  sharedResumeFunction.assign([]() {
+    LOG(WARNING) << "SNIP:ImageFetcher::requestImage: resume callback";
+  });
+  sharedCancelationFunction.assign([]() {
+    LOG(WARNING) << "SNIP:ImageFetcher::requestImage: cancel callback";
+  });
+  return ImageRequest{
+      imageSource, telemetry, sharedResumeFunction, sharedCancelationFunction};
 }
 
 void ImageFetcher::flushImageRequests() {
+#ifdef REACT_NATIVE_DEBUG
+  if (ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid()) {
+    assertThread();
+  }
+#endif
   if (items_.empty()) {
     return;
   }
@@ -59,13 +86,30 @@ void ImageFetcher::flushImageRequests() {
               "experimental_prefetchResources");
 
   for (auto& [surfaceId, surfaceImageRequests] : items_) {
-    auto readableMapBuffer = JReadableMapBuffer::createWithContents(
-        serializeImageRequests(surfaceImageRequests));
-    prefetchResources(
-        fabricUIManager_, surfaceId, "RCTImageView", readableMapBuffer.get());
+    jni::local_ref<JReadableMapBuffer::jhybridobject> readableMapBuffer =
+        nullptr;
+    {
+      TraceSection s("ImageFetcher::createWithContents");
+      readableMapBuffer = JReadableMapBuffer::createWithContents(
+          serializeImageRequests(surfaceImageRequests));
+    }
+
+    {
+      TraceSection s("ImageFetcher::experimental_prefetchResource");
+      prefetchResources(
+          fabricUIManager_, surfaceId, "RCTImageView", readableMapBuffer.get());
+    }
   }
 
   items_.clear();
 }
 
+#ifdef REACT_NATIVE_DEBUG
+void ImageFetcher::assertThread() const {
+  react_native_assert(
+      threadId_ != std::this_thread::get_id() &&
+      "ImageFetcher method called from the wrong thread!");
+}
+#endif
+
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h

@@ -13,6 +13,9 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
+#ifdef REACT_NATIVE_DEBUG
+#include <thread>
+#endif
 
 namespace facebook::react {
 
@@ -39,5 +42,10 @@ class ImageFetcher {
 
   std::unordered_map<SurfaceId, std::vector<ImageRequestItem>> items_;
   std::shared_ptr<const ContextContainer> contextContainer_;
+
+#ifdef REACT_NATIVE_DEBUG
+  std::thread::id threadId_;
+  void assertThread() const;
+#endif
 };
 } // namespace facebook::react