archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8198441: Replace native Runtime::runFinalization0 method with shared secrets

Browse source 
Reviewed-by: martin
This commit is contained in:
Mandy Chung 2018-02-20 11:28:32 -08:00
parent d4c69026bf
commit f42b8e4a00
5 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/java/lang/Runtime.java
View file

@ -35,6 +35,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.StringTokenizer;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.reflect.CallerSensitive;
import jdk.internal.reflect.Reflection;
@ -702,9 +704,6 @@ public class Runtime {
*/
public native void gc();
/* Wormhole for calling java.lang.ref.Finalizer.runFinalization */
private static native void runFinalization0();
/**
* Runs the finalization methods of any objects pending finalization.
* Calling this method suggests that the Java virtual machine expend
@ -724,7 +723,7 @@ public class Runtime {
* @see java.lang.Object#finalize()
*/
public void runFinalization() {
runFinalization0();
SharedSecrets.getJavaLangRefAccess().runFinalization();
}
/**

7
src/java.base/share/classes/java/lang/ref/Reference.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -235,6 +235,11 @@ public abstract class Reference<T> {
{
return Reference.waitForReferenceProcessing();
}
@Override
public void runFinalization() {
Finalizer.runFinalization();
}
});
}

9
src/java.base/share/classes/jdk/internal/misc/JavaLangRefAccess.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,4 +36,11 @@ public interface JavaLangRefAccess {
* {@link java.lang.ref.Reference}s, {@code false} otherwise.
*/
boolean waitForReferenceProcessing() throws InterruptedException;
/**
* Runs the finalization methods of any objects pending finalization.
*
* Invoked by Runtime.runFinalization()
*/
void runFinalization();
}

15
src/java.base/share/native/libjava/Runtime.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -65,19 +65,6 @@ Java_java_lang_Runtime_gc(JNIEnv *env, jobject this)
JVM_GC();
}
JNIEXPORT void JNICALL
Java_java_lang_Runtime_runFinalization0(JNIEnv *env, jobject this)
{
jclass cl;
jmethodID mid;
if ((cl = (*env)->FindClass(env, "java/lang/ref/Finalizer"))
&& (mid = (*env)->GetStaticMethodID(env, cl,
"runFinalization", "()V"))) {
(*env)->CallStaticVoidMethod(env, cl, mid);
}
}
JNIEXPORT jint JNICALL
Java_java_lang_Runtime_availableProcessors(JNIEnv *env, jobject this)
{