1313import java .io .IOException ;
1414import java .lang .ref .Cleaner ;
1515import java .util .Arrays ;
16+ import java .util .Map ;
1617import java .util .Objects ;
1718import java .util .Optional ;
19+ import java .util .concurrent .ConcurrentHashMap ;
1820import java .util .concurrent .atomic .AtomicLong ;
1921import java .util .logging .Level ;
2022
5052import org .truffleruby .core .exception .RubySyntaxError ;
5153import org .truffleruby .core .exception .RubySystemCallError ;
5254import org .truffleruby .core .exception .RubySystemExit ;
53- import org .truffleruby .core .fiber .FiberPoolThread ;
5455import org .truffleruby .core .fiber .RubyFiber ;
5556import org .truffleruby .core .hash .RubyHash ;
5657import org .graalvm .options .OptionValues ;
@@ -185,16 +186,44 @@ public final class RubyLanguage extends TruffleLanguage<RubyContext> {
185186 * {@link TranslatorEnvironment#newFrameDescriptorBuilder(org.truffleruby.parser.ParentFrameDescriptor, boolean)}. */
186187 public static final FrameDescriptor EMPTY_FRAME_DESCRIPTOR = new FrameDescriptor (Nil .INSTANCE );
187188
188- /** We need an extra indirection added to ContextThreadLocal due to multiple Fibers of different Ruby Threads
189- * sharing the same Java Thread when using the fiber pool. */
190- public static final class ThreadLocalState {
191- public RubyThread rubyThread ;
189+ private RubyThread getOrCreateForeignThread (RubyContext context , Thread thread ) {
190+ RubyThread foreignThread = rubyThreadInitMap .remove (thread );
191+ if (foreignThread == null ) {
192+ foreignThread = context .getThreadManager ().createForeignThread ();
193+ rubyThreadInitMap .put (thread , foreignThread );
194+ }
195+ return foreignThread ;
192196 }
193197
194- private final ContextThreadLocal <ThreadLocalState > threadLocalState = createContextThreadLocal (
195- (context , thread ) -> thread instanceof FiberPoolThread
196- ? ((FiberPoolThread ) thread ).threadLocalState
197- : new ThreadLocalState ());
198+ public final Map <Thread , RubyThread > rubyThreadInitMap = new ConcurrentHashMap <>();
199+ private final ContextThreadLocal <RubyThread > rubyThread = createContextThreadLocal (
200+ (context , thread ) -> {
201+ if (thread == context .getThreadManager ().getOrInitializeRootJavaThread ()) {
202+ // Already initialized when creating the context
203+ return context .getThreadManager ().getRootThread ();
204+ }
205+
206+ if (context .getThreadManager ().isRubyManagedThread (thread )) {
207+ return Objects .requireNonNull (rubyThreadInitMap .remove (thread ));
208+ }
209+
210+ return getOrCreateForeignThread (context , thread );
211+ });
212+
213+ public final Map <Thread , RubyFiber > rubyFiberInitMap = new ConcurrentHashMap <>();
214+ private final ContextThreadLocal <RubyFiber > rubyFiber = createContextThreadLocal (
215+ (context , thread ) -> {
216+ if (thread == context .getThreadManager ().getOrInitializeRootJavaThread ()) {
217+ // Already initialized when creating the context
218+ return context .getThreadManager ().getRootThread ().getRootFiber ();
219+ }
220+
221+ if (context .getThreadManager ().isRubyManagedThread (thread )) {
222+ return Objects .requireNonNull (rubyFiberInitMap .remove (thread ));
223+ }
224+
225+ return getOrCreateForeignThread (context , thread ).getRootFiber ();
226+ });
198227
199228 private final CyclicAssumption tracingCyclicAssumption = new CyclicAssumption ("object-space-tracing" );
200229 @ CompilationFinal private volatile Assumption tracingAssumption = tracingCyclicAssumption .getAssumption ();
@@ -330,18 +359,11 @@ public RubyLanguage() {
330359 }
331360
332361 public RubyThread getCurrentThread () {
333- final RubyThread rubyThread = threadLocalState .get ().rubyThread ;
334- if (rubyThread == null ) {
335- CompilerDirectives .transferToInterpreterAndInvalidate ();
336- throw CompilerDirectives .shouldNotReachHere (
337- "No Ruby Thread is associated with current Java Thread: " + Thread .currentThread ());
338- }
339- return rubyThread ;
362+ return rubyThread .get ();
340363 }
341364
342- public void setupCurrentThread (Thread javaThread , RubyThread rubyThread ) {
343- final ThreadLocalState threadLocalState = this .threadLocalState .get (javaThread );
344- threadLocalState .rubyThread = rubyThread ;
365+ public RubyFiber getCurrentFiber () {
366+ return rubyFiber .get ();
345367 }
346368
347369 @ TruffleBoundary
@@ -553,39 +575,34 @@ protected boolean isThreadAccessAllowed(Thread thread, boolean singleThreaded) {
553575
554576 @ Override
555577 public void initializeThread (RubyContext context , Thread thread ) {
556- LOGGER .fine (() -> "initializeThread(#" + thread . getId ( ) + " " + thread + ")" );
578+ LOGGER .fine (() -> "initializeThread(#" + getThreadId ( thread ) + " " + thread + ")" );
557579
558580 if (thread == context .getThreadManager ().getOrInitializeRootJavaThread ()) {
559581 // Already initialized when creating the context
560- setupCurrentThread (thread , context .getThreadManager ().getRootThread ());
561582 return ;
562583 }
563584
564585 if (context .getThreadManager ().isRubyManagedThread (thread )) {
565- final RubyThread rubyThread = context . getThreadManager (). getCurrentThreadOrNull ();
566- if (rubyThread != null && rubyThread .thread == thread ) { // new Ruby Thread
586+ final RubyThread rubyThread = getCurrentThread ();
587+ if (rubyThread .thread == thread ) { // new Ruby Thread
567588 if (thread != Thread .currentThread ()) {
568589 throw CompilerDirectives
569590 .shouldNotReachHere ("Ruby threads should be initialized on their Java thread" );
570591 }
571592 context .getThreadManager ().start (rubyThread , thread );
572- setupCurrentThread (thread , rubyThread );
573593 } else {
574594 // Fiber
575595 }
576596 return ;
577597 }
578598
579- final RubyThread foreignThread = context . getThreadManager (). createForeignThread ();
599+ final RubyThread foreignThread = getCurrentThread ();
580600 context .getThreadManager ().startForeignThread (foreignThread , thread );
581- setupCurrentThread (thread , foreignThread );
582601 }
583602
584603 @ Override
585604 public void disposeThread (RubyContext context , Thread thread ) {
586- LOGGER .fine (
587- () -> "disposeThread(#" + thread .getId () + " " + thread + " on " +
588- context .getThreadManager ().getCurrentThreadOrNull () + ")" );
605+ LOGGER .fine (() -> "disposeThread(#" + getThreadId (thread ) + " " + thread + " on " + getCurrentThread () + ")" );
589606
590607 if (thread == context .getThreadManager ().getRootJavaThread ()) {
591608 if (context .getEnv ().isPreInitialization ()) {
@@ -604,8 +621,8 @@ public void disposeThread(RubyContext context, Thread thread) {
604621 }
605622
606623 if (context .getThreadManager ().isRubyManagedThread (thread )) {
607- final RubyThread rubyThread = context . getThreadManager (). getCurrentThreadOrNull ();
608- if (rubyThread != null && rubyThread .thread == thread ) { // Thread
624+ final RubyThread rubyThread = getCurrentThread ();
625+ if (rubyThread .thread == thread ) { // Thread
609626 if (thread != Thread .currentThread ()) {
610627 throw CompilerDirectives .shouldNotReachHere ("Ruby threads should be disposed on their Java thread" );
611628 }
@@ -617,7 +634,7 @@ public void disposeThread(RubyContext context, Thread thread) {
617634 }
618635
619636 // A foreign Thread, its Fibers are considered isRubyManagedThread()
620- final RubyThread rubyThread = context . getThreadManager (). getRubyThreadForJavaThread (thread );
637+ final RubyThread rubyThread = this . rubyThread . get (thread );
621638 context .getThreadManager ().cleanup (rubyThread , thread );
622639 }
623640
@@ -848,4 +865,9 @@ private static String buildCoreLoadPath(String coreLoadPath) {
848865 throw CompilerDirectives .shouldNotReachHere (e );
849866 }
850867 }
868+
869+ @ SuppressWarnings ("deprecation" ) // deprecated on JDK19 by Thread#threadId, but that's added in JDK19
870+ public static long getThreadId (Thread thread ) {
871+ return thread .getId ();
872+ }
851873}
0 commit comments