more

Author: pjfanning

actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java

@@ -18,20 +18,15 @@
 
 import org.apache.pekko.actor.ActorCell;
 import org.apache.pekko.dispatch.Mailbox;
-import org.apache.pekko.util.Unsafe;
 
 final class AbstractActorCell {
   static final VarHandle mailboxHandle;
   static final VarHandle childrenHandle;
   static final VarHandle nextNameHandle;
-  static final long functionRefsOffset;
+  static final VarHandle functionRefsHandle;
 
   static {
     try {
-      functionRefsOffset =
-          Unsafe.instance.objectFieldOffset(
-              ActorCell.class.getDeclaredField(
-                  "org$apache$pekko$actor$dungeon$Children$$_functionRefsDoNotCallMeDirectly"));
       MethodHandles.Lookup lookup =
           MethodHandles.privateLookupIn(ActorCell.class, MethodHandles.lookup());
       mailboxHandle =
@@ -49,6 +44,12 @@ final class AbstractActorCell {
               ActorCell.class,
               "org$apache$pekko$actor$dungeon$Children$$_nextNameDoNotCallMeDirectly",
               long.class);
+      functionRefsHandle =
+          lookup.findVarHandle(
+              ActorCell.class,
+              "org$apache$pekko$actor$dungeon$Children$$_functionRefsDoNotCallMeDirectly",
+              scala.collection.Map.class);
+
     } catch (Throwable t) {
       throw new ExceptionInInitializerError(t);
     }

actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala

@@ -23,7 +23,7 @@ import org.apache.pekko
 import pekko.actor._
 import pekko.annotation.InternalStableApi
 import pekko.serialization.{ Serialization, SerializationExtension, Serializers }
-import pekko.util.{ Helpers, Unsafe }
+import pekko.util.Helpers
 
 private[pekko] object Children {
   val GetNobody = () => Nobody
@@ -64,8 +64,7 @@ private[pekko] trait Children { this: ActorCell =>
 
   @nowarn @volatile private var _functionRefsDoNotCallMeDirectly = Map.empty[String, FunctionRef]
   private def functionRefs: Map[String, FunctionRef] =
-    Unsafe.instance.getObjectVolatile(this, AbstractActorCell.functionRefsOffset).asInstanceOf[Map[String,
-      FunctionRef]]: @nowarn("cat=deprecation")
+    AbstractActorCell.functionRefsHandle.get(this).asInstanceOf[Map[String, FunctionRef]]
 
   private[pekko] def getFunctionRefOrNobody(name: String, uid: Int = ActorCell.undefinedUid): InternalActorRef =
     functionRefs.getOrElse(name, Children.GetNobody()) match {
@@ -84,8 +83,7 @@ private[pekko] trait Children { this: ActorCell =>
     @tailrec def rec(): Unit = {
       val old = functionRefs
       val added = old.updated(childPath.name, ref)
-      if (!Unsafe.instance.compareAndSwapObject(this, AbstractActorCell.functionRefsOffset, old, added): @nowarn(
-          "cat=deprecation")) rec()
+      if (!AbstractActorCell.functionRefsHandle.compareAndSet(this, old, added)) rec()
     }
     rec()
 
@@ -100,8 +98,7 @@ private[pekko] trait Children { this: ActorCell =>
       if (!old.contains(name)) false
       else {
         val removed = old - name
-        if (!Unsafe.instance.compareAndSwapObject(this, AbstractActorCell.functionRefsOffset, old, removed): @nowarn(
-            "cat=deprecation")) rec()
+        if (!AbstractActorCell.functionRefsHandle.compareAndSet(this, old, removed)) rec()
         else {
           ref.stop()
           true
@@ -112,9 +109,9 @@ private[pekko] trait Children { this: ActorCell =>
   }
 
   protected def stopFunctionRefs(): Unit = {
-    val refs = Unsafe.instance
-      .getAndSetObject(this, AbstractActorCell.functionRefsOffset, Map.empty)
-      .asInstanceOf[Map[String, FunctionRef]]: @nowarn("cat=deprecation")
+    val refs = AbstractActorCell.functionRefsHandle
+      .getAndSet(this, Map.empty)
+      .asInstanceOf[Map[String, FunctionRef]]
     refs.valuesIterator.foreach(_.stop())
   }