Update RC to use the extracted thread util classes

Summary: This diff updates RenderCore to use the extracted thread util classes and removes the classes present in the main rendercore module. It also updates all callsites affected by this change by adding or updating the imports. allow-large-files Reviewed By: astreet Differential Revision: D69584102 fbshipit-source-id: beda34588bebc4b7667021350cbee289ccc0bacd
facebook · Feb 17, 2025 · 3e9bf83 · 3e9bf83
1 parent 65e6bb1
commit 3e9bf83
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 313 deletions.
diff --git a/litho-core/src/main/java/com/facebook/litho/EventHandler.java b/litho-core/src/main/java/com/facebook/litho/EventHandler.java
@@ -25,8 +25,8 @@
 import com.facebook.litho.debug.DebugInfoReporter;
 import com.facebook.rendercore.Equivalence;
 import com.facebook.rendercore.Function;
+import com.facebook.rendercore.thread.utils.ThreadUtils;
 import com.facebook.rendercore.utils.CommonUtils;
-import com.facebook.rendercore.utils.ThreadUtils;
 import kotlin.Unit;
 
 public class EventHandler<E> implements Function<Void>, Equivalence<EventHandler<E>> {

diff --git a/litho-core/src/main/java/com/facebook/litho/NestedLithoTree.kt b/litho-core/src/main/java/com/facebook/litho/NestedLithoTree.kt
@@ -21,7 +21,7 @@ import androidx.annotation.UiThread
 import com.facebook.kotlin.compilerplugins.dataclassgenerate.annotation.DataClassGenerate
 import com.facebook.kotlin.compilerplugins.dataclassgenerate.annotation.Mode
 import com.facebook.rendercore.SizeConstraints
-import com.facebook.rendercore.utils.ThreadUtils.assertMainThread
+import com.facebook.rendercore.thread.utils.ThreadUtils.assertMainThread
 
 /**
  * The [NestedLithoTree] should be used to render Litho components in a container, say a Primitive

diff --git a/litho-core/src/main/java/com/facebook/litho/TreeFuture.kt b/litho-core/src/main/java/com/facebook/litho/TreeFuture.kt
@@ -30,7 +30,7 @@ import com.facebook.litho.debug.LithoDebugEvents.TreeFuture.resume
 import com.facebook.litho.debug.LithoDebugEvents.TreeFuture.run
 import com.facebook.litho.debug.LithoDebugEvents.TreeFuture.wait
 import com.facebook.rendercore.Systracer
-import com.facebook.rendercore.instrumentation.FutureInstrumenter.instrument
+import com.facebook.rendercore.thread.utils.instrumentation.FutureInstrumenter.instrument
 import java.util.concurrent.Callable
 import java.util.concurrent.CancellationException
 import java.util.concurrent.ExecutionException

diff --git a/...unt/src/main/java/com/facebook/rendercore/incrementalmount/IncrementalMountExtension.java b/...unt/src/main/java/com/facebook/rendercore/incrementalmount/IncrementalMountExtension.java
@@ -17,7 +17,7 @@
 package com.facebook.rendercore.incrementalmount;
 
 import static com.facebook.rendercore.incrementalmount.IncrementalMountExtensionConfigs.DEBUG_TAG;
-import static com.facebook.rendercore.utils.ThreadUtils.assertMainThread;
+import static com.facebook.rendercore.thread.utils.ThreadUtils.assertMainThread;
 
 import android.graphics.Rect;
 import android.util.Log;

diff --git a/litho-rendercore-transitions/src/main/java/com/facebook/litho/TransitionsExtension.java b/litho-rendercore-transitions/src/main/java/com/facebook/litho/TransitionsExtension.java
@@ -16,7 +16,7 @@
 
 package com.facebook.litho;
 
-import static com.facebook.rendercore.utils.ThreadUtils.assertMainThread;
+import static com.facebook.rendercore.thread.utils.ThreadUtils.assertMainThread;
 
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;

diff --git a/...sitions/src/main/java/com/facebook/litho/choreographercompat/ChoreographerCompatImpl.java b/...sitions/src/main/java/com/facebook/litho/choreographercompat/ChoreographerCompatImpl.java
@@ -24,7 +24,7 @@
 import androidx.annotation.VisibleForTesting;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.litho.WorkContinuationInstrumenter;
-import com.facebook.rendercore.utils.ThreadUtils;
+import com.facebook.rendercore.thread.utils.ThreadUtils;
 import javax.annotation.Nullable;
 
 /**

diff --git a/litho-rendercore/BUCK b/litho-rendercore/BUCK
@@ -9,6 +9,7 @@ load(
     "LITHO_JSR_TARGET",
     "LITHO_PROGUARDANNOTATIONS_TARGET",
     "LITHO_PROGUARD_ANNOTATIONS_TARGET",
+    "LITHO_RENDERCORE_THREAD_UTILS_TARGET",
     "LITHO_RES_TARGET",
     "LITHO_VISIBILITY",
     "litho_android_library",
@@ -36,6 +37,7 @@ litho_android_library(
         "//third-party/java/androidx/core/core:core",
         "//third-party/java/androidx/core/core-ktx:core-ktx",
     ],
+    exported_deps = [LITHO_RENDERCORE_THREAD_UTILS_TARGET],
 )
 
 android_build_config(

diff --git a/litho-rendercore/build.gradle b/litho-rendercore/build.gradle
@@ -59,6 +59,8 @@ android {
 }
 
 dependencies {
+  api project(":litho-rendercore-thread-utils")
+
   // Annotations
   compileOnly deps.jsr305
   implementation deps.inferAnnotations

diff --git a/litho-rendercore/src/main/java/com/facebook/rendercore/LayoutFuture.kt b/litho-rendercore/src/main/java/com/facebook/rendercore/LayoutFuture.kt
@@ -18,6 +18,7 @@ package com.facebook.rendercore
 
 import android.content.Context
 import com.facebook.rendercore.extensions.RenderCoreExtension
+import com.facebook.rendercore.thread.utils.ThreadInheritingPriorityFuture
 import java.util.concurrent.Callable
 
 class LayoutFuture<State, RenderContext>(

diff --git a/litho-rendercore/src/main/java/com/facebook/rendercore/MountItemsPool.kt b/litho-rendercore/src/main/java/com/facebook/rendercore/MountItemsPool.kt
@@ -30,7 +30,7 @@ import androidx.core.util.Pools
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
-import com.facebook.rendercore.utils.ThreadUtils.runOnUiThread
+import com.facebook.rendercore.thread.utils.ThreadUtils.runOnUiThread
 import java.util.WeakHashMap
 import java.util.concurrent.atomic.AtomicInteger
 import javax.annotation.concurrent.GuardedBy

diff --git a/litho-rendercore/src/main/java/com/facebook/rendercore/RenderResultFuture.kt b/litho-rendercore/src/main/java/com/facebook/rendercore/RenderResultFuture.kt
@@ -18,6 +18,7 @@ package com.facebook.rendercore
 
 import android.content.Context
 import com.facebook.rendercore.extensions.RenderCoreExtension
+import com.facebook.rendercore.thread.utils.ThreadInheritingPriorityFuture
 import java.util.concurrent.Callable
 
 class RenderResultFuture<State, RenderContext>(

diff --git a/litho-rendercore/src/main/java/com/facebook/rendercore/RenderState.kt b/litho-rendercore/src/main/java/com/facebook/rendercore/RenderState.kt
@@ -23,7 +23,7 @@ import android.os.Message
 import com.facebook.infer.annotation.ThreadConfined
 import com.facebook.rendercore.StateUpdateReceiver.StateUpdate
 import com.facebook.rendercore.extensions.RenderCoreExtension
-import com.facebook.rendercore.utils.ThreadUtils
+import com.facebook.rendercore.thread.utils.ThreadUtils
 import com.facebook.rendercore.utils.VSyncUtils
 import java.util.Objects
 import java.util.concurrent.Executor

diff --git a/litho-rendercore/src/main/java/com/facebook/rendercore/ResolveFuture.kt b/litho-rendercore/src/main/java/com/facebook/rendercore/ResolveFuture.kt
@@ -18,6 +18,7 @@ package com.facebook.rendercore
 
 import com.facebook.rendercore.RenderState.ResolveFunc
 import com.facebook.rendercore.StateUpdateReceiver.StateUpdate
+import com.facebook.rendercore.thread.utils.ThreadInheritingPriorityFuture
 import java.util.concurrent.Callable
 
 class ResolveFuture<State, RenderContext, StateUpdateType : StateUpdate<*>>(

diff --git a/litho-rendercore/src/main/java/com/facebook/rendercore/ThreadInheritingPriorityFuture.kt b/litho-rendercore/src/main/java/com/facebook/rendercore/ThreadInheritingPriorityFuture.kt
diff --git a/litho-rendercore/src/main/java/com/facebook/rendercore/instrumentation/FutureInstrumenter.kt b/litho-rendercore/src/main/java/com/facebook/rendercore/instrumentation/FutureInstrumenter.kt