Inline baseline JDK methods from JDKSpecific

Now that jboss-threads uses JDK-11+, these methods no longer use a differnt implementation per jdk release.
jbossas · Feb 14, 2024 · 233008a · 233008a
1 parent 037e5e5
commit 233008a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/src/main/java/org/jboss/threads/EnhancedQueueExecutor.java b/src/main/java/org/jboss/threads/EnhancedQueueExecutor.java
@@ -576,7 +576,7 @@ public Builder setKeepAliveTime(final Duration keepAliveTime) {
         @Deprecated
         public Builder setKeepAliveTime(final long keepAliveTime, final TimeUnit keepAliveUnits) {
             Assert.checkNotNullParam("keepAliveUnits", keepAliveUnits);
-            return setKeepAliveTime(Duration.of(keepAliveTime, JDKSpecific.timeToTemporal(keepAliveUnits)));
+            return setKeepAliveTime(Duration.of(keepAliveTime, keepAliveUnits.toChronoUnit()));
         }
 
         /**
@@ -2248,7 +2248,7 @@ void park(EnhancedQueueExecutor enhancedQueueExecutor) {
                 if (spins < YIELD_FACTOR) {
                     Thread.yield();
                 } else {
-                    JDKSpecific.onSpinWait();
+                    Thread.onSpinWait();
                 }
                 spins--;
                 if (parked == STATE_UNPARKED && unsafe.compareAndSwapInt(this, parkedOffset, STATE_UNPARKED, STATE_NORMAL)) {
@@ -2281,7 +2281,7 @@ void park(EnhancedQueueExecutor enhancedQueueExecutor, long nanos) {
                     if (spins < YIELD_FACTOR) {
                         Thread.yield();
                     } else {
-                        JDKSpecific.onSpinWait();
+                        Thread.onSpinWait();
                     }
                     if (parked == STATE_UNPARKED && unsafe.compareAndSwapInt(this, parkedOffset, STATE_UNPARKED, STATE_NORMAL)) {
                         return;

diff --git a/src/main/java/org/jboss/threads/EnhancedViewExecutor.java b/src/main/java/org/jboss/threads/EnhancedViewExecutor.java
@@ -355,7 +355,7 @@ private EnhancedViewExecutorRunnable blockingTake() {
                 // try again
                 if (spins < MAX_QUEUE_SPINS) {
                     spins++;
-                    JDKSpecific.onSpinWait();
+                    Thread.onSpinWait();
                 } else {
                     Thread.yield();
                 }

diff --git a/src/main/java/org/jboss/threads/JBossThread.java b/src/main/java/org/jboss/threads/JBossThread.java
@@ -152,7 +152,7 @@ public void interrupt() {
             } else if (oldVal == STATE_INTERRUPT_IN_PROGRESS) {
                 // wait for interruption on other thread to be completed
                 if (spins < MAX_INTERRUPT_SPINS) {
-                    JDKSpecific.onSpinWait();
+                    onSpinWait();
                     spins++;
                 } else {
                     Thread.yield();

diff --git a/src/main/java/org/jboss/threads/JDKSpecific.java b/src/main/java/org/jboss/threads/JDKSpecific.java