Skip to content

Commit b9d4211

Browse files
iklamiklam
committed
8260193: Remove JVM_GetInterfaceVersion() and JVM_DTraceXXX
Reviewed-by: alanb, lfoltan, gziemski, ihse
1 parent 98a7692 commit b9d4211

4 files changed

Lines changed: 2 additions & 112 deletions

File tree

‎make/data/hotspot-symbols/symbols-unix‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -100,7 +100,6 @@ JVM_GetExtendedNPEMessage
100100
JVM_GetFieldIxModifiers
101101
JVM_GetFieldTypeAnnotations
102102
JVM_GetInheritedAccessControlContext
103-
JVM_GetInterfaceVersion
104103
JVM_GetManagement
105104
JVM_GetMethodIxArgsSize
106105
JVM_GetMethodIxByteCode

‎src/hotspot/share/include/jvm.h‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,6 @@ extern "C" {
5656
* namely the jio_xxxprintf functions, are included from jvm_io.h.
5757
*/
5858

59-
/*
60-
* Bump the version number when either of the following happens:
61-
*
62-
* 1. There is a change in JVM_* functions.
63-
*
64-
* 2. There is a change in the contract between VM and Java classes.
65-
* For example, if the VM relies on a new private field in Thread
66-
* class.
67-
*/
68-
69-
#define JVM_INTERFACE_VERSION 6
70-
71-
JNIEXPORT jint JNICALL
72-
JVM_GetInterfaceVersion(void);
7359

7460
/*************************************************************************
7561
PART 1: Functions for Native Libraries
@@ -761,80 +747,6 @@ JVM_AssertionStatusDirectives(JNIEnv *env, jclass unused);
761747
JNIEXPORT jboolean JNICALL
762748
JVM_SupportsCX8(void);
763749

764-
/*
765-
* com.sun.dtrace.jsdt support
766-
*/
767-
768-
#define JVM_TRACING_DTRACE_VERSION 1
769-
770-
/*
771-
* Structure to pass one probe description to JVM
772-
*/
773-
typedef struct {
774-
jmethodID method;
775-
jstring function;
776-
jstring name;
777-
void* reserved[4]; // for future use
778-
} JVM_DTraceProbe;
779-
780-
/**
781-
* Encapsulates the stability ratings for a DTrace provider field
782-
*/
783-
typedef struct {
784-
jint nameStability;
785-
jint dataStability;
786-
jint dependencyClass;
787-
} JVM_DTraceInterfaceAttributes;
788-
789-
/*
790-
* Structure to pass one provider description to JVM
791-
*/
792-
typedef struct {
793-
jstring name;
794-
JVM_DTraceProbe* probes;
795-
jint probe_count;
796-
JVM_DTraceInterfaceAttributes providerAttributes;
797-
JVM_DTraceInterfaceAttributes moduleAttributes;
798-
JVM_DTraceInterfaceAttributes functionAttributes;
799-
JVM_DTraceInterfaceAttributes nameAttributes;
800-
JVM_DTraceInterfaceAttributes argsAttributes;
801-
void* reserved[4]; // for future use
802-
} JVM_DTraceProvider;
803-
804-
/*
805-
* Get the version number the JVM was built with
806-
*/
807-
JNIEXPORT jint JNICALL
808-
JVM_DTraceGetVersion(JNIEnv* env);
809-
810-
/*
811-
* Register new probe with given signature, return global handle
812-
*
813-
* The version passed in is the version that the library code was
814-
* built with.
815-
*/
816-
JNIEXPORT jlong JNICALL
817-
JVM_DTraceActivate(JNIEnv* env, jint version, jstring module_name,
818-
jint providers_count, JVM_DTraceProvider* providers);
819-
820-
/*
821-
* Check JSDT probe
822-
*/
823-
JNIEXPORT jboolean JNICALL
824-
JVM_DTraceIsProbeEnabled(JNIEnv* env, jmethodID method);
825-
826-
/*
827-
* Destroy custom DOF
828-
*/
829-
JNIEXPORT void JNICALL
830-
JVM_DTraceDispose(JNIEnv* env, jlong activation_handle);
831-
832-
/*
833-
* Check to see if DTrace is supported by OS
834-
*/
835-
JNIEXPORT jboolean JNICALL
836-
JVM_DTraceIsSupported(JNIEnv* env);
837-
838750
/*************************************************************************
839751
PART 2: Support for the Verifier and Class File Format Checker
840752
************************************************************************/

‎src/hotspot/share/prims/jvm.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
#include "services/threadService.hpp"
9595
#include "utilities/copy.hpp"
9696
#include "utilities/defaultStream.hpp"
97-
#include "utilities/dtrace.hpp"
9897
#include "utilities/events.hpp"
9998
#include "utilities/macros.hpp"
10099
#include "utilities/utf8.hpp"
@@ -228,15 +227,6 @@ void trace_class_resolution(Klass* to_class) {
228227
}
229228
}
230229

231-
232-
// Interface version /////////////////////////////////////////////////////////////////////
233-
234-
235-
JVM_LEAF(jint, JVM_GetInterfaceVersion())
236-
return JVM_INTERFACE_VERSION;
237-
JVM_END
238-
239-
240230
// java.lang.System //////////////////////////////////////////////////////////////////////
241231

242232

‎src/java.base/share/native/libjava/check_version.c‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -30,16 +30,5 @@
3030
JNIEXPORT jint JNICALL
3131
DEF_JNI_OnLoad(JavaVM *vm, void *reserved)
3232
{
33-
jint vm_version = JVM_GetInterfaceVersion();
34-
if (vm_version != JVM_INTERFACE_VERSION) {
35-
JNIEnv *env;
36-
char buf[128];
37-
sprintf(buf, "JVM interface version mismatch: expecting %d, got %d.",
38-
JVM_INTERFACE_VERSION, (int)vm_version);
39-
(*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_2);
40-
if (env) {
41-
(*env)->FatalError(env, buf);
42-
}
43-
}
4433
return JNI_VERSION_1_2;
4534
}

0 commit comments

Comments
 (0)