mirror of
https://abf.rosa.ru/djam/java-1.8.0-openjdk.git
synced 2025-04-18 14:34:21 +00:00
Take nanoTime patch from 1.7.0
This commit is contained in:
parent
6f20c10dc9
commit
2a389cb332
2 changed files with 32 additions and 0 deletions
29
java-1.8.0-openjdk-use-nanoTime_in_thread-join.patch
Normal file
29
java-1.8.0-openjdk-use-nanoTime_in_thread-join.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
diff -Naur jdk8.orig/jdk/src/share/classes/java/lang/Thread.java jdk8/jdk/src/share/classes/java/lang/Thread.java
|
||||||
|
--- jdk8.orig/jdk/src/share/classes/java/lang/Thread.java 2015-06-05 14:50:08.649527076 +0300
|
||||||
|
+++ jdk8/jdk/src/share/classes/java/lang/Thread.java 2015-06-05 14:51:43.135521481 +0300
|
||||||
|
@@ -36,6 +36,7 @@
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.ConcurrentMap;
|
||||||
|
import java.util.concurrent.locks.LockSupport;
|
||||||
|
+import java.util.concurrent.TimeUnit;
|
||||||
|
import sun.nio.ch.Interruptible;
|
||||||
|
import sun.reflect.CallerSensitive;
|
||||||
|
import sun.reflect.Reflection;
|
||||||
|
@@ -1233,7 +1234,7 @@
|
||||||
|
*/
|
||||||
|
public final synchronized void join(long millis)
|
||||||
|
throws InterruptedException {
|
||||||
|
- long base = System.currentTimeMillis();
|
||||||
|
+ long base = System.nanoTime();
|
||||||
|
long now = 0;
|
||||||
|
|
||||||
|
if (millis < 0) {
|
||||||
|
@@ -1251,7 +1252,7 @@
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
wait(delay);
|
||||||
|
- now = System.currentTimeMillis() - base;
|
||||||
|
+ now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - base);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -233,6 +233,8 @@ Patch402: atomic_linux_zero.inline.hpp.patch
|
||||||
# Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
|
# Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
|
||||||
Patch403: rhbz1206656_fix_current_stack_pointer.patch
|
Patch403: rhbz1206656_fix_current_stack_pointer.patch
|
||||||
|
|
||||||
|
# Rely on nanoTime to get Thread.join working when clock is stopped or set back
|
||||||
|
Patch501: java-1.7.0-openjdk-use-nanoTime_in_thread-join.patch
|
||||||
Patch503: d318d83c4e74.patch
|
Patch503: d318d83c4e74.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
|
@ -466,6 +468,7 @@ sh %{SOURCE12}
|
||||||
%patch402
|
%patch402
|
||||||
%patch403
|
%patch403
|
||||||
|
|
||||||
|
%patch501
|
||||||
%patch503
|
%patch503
|
||||||
|
|
||||||
# Extract systemtap tapsets
|
# Extract systemtap tapsets
|
||||||
|
|
Loading…
Add table
Reference in a new issue