stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8029007: Check src/share/native/sun/misc code for JNI pending exceptions

Browse Source 
Reviewed-by: chegar, alanb, rriggs, mchung
This commit is contained in:
Dan Xu 2014-01-13 16:32:18 -08:00
parent 5ad3d27c91
commit 45609addf6
4 changed files with 28 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/make/mapfiles/libjava/mapfile-vers
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1997, 2014, 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
@ -273,7 +273,6 @@ SUNWprivate_1.1 {
Java_sun_misc_Version_getJdkSpecialVersion;
Java_sun_misc_Version_getJvmVersionInfo;
Java_sun_misc_Version_getJvmSpecialVersion;
Java_sun_misc_VM_getThreadStateValues;
Java_sun_misc_VM_latestUserDefinedLoader;
Java_sun_misc_VM_initialize;
Java_sun_misc_VMSupport_initAgentProperties;

16
jdk/src/share/native/sun/misc/MessageUtils.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2014, 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
@ -35,7 +35,7 @@ static void
printToFile(JNIEnv *env, jstring s, FILE *file)
{
char *sConverted;
int length;
int length = 0;
int i;
const jchar *sAsArray;
@ -45,8 +45,20 @@ printToFile(JNIEnv *env, jstring s, FILE *file)
}
sAsArray = (*env)->GetStringChars(env, s, NULL);
if (!sAsArray)
return;
length = (*env)->GetStringLength(env, s);
if (length == 0) {
(*env)->ReleaseStringChars(env, s, sAsArray);
return;
}
sConverted = (char *) malloc(length + 1);
if (!sConverted) {
(*env)->ReleaseStringChars(env, s, sAsArray);
JNU_ThrowOutOfMemoryError(env, NULL);
return;
}
for(i = 0; i < length; i++) {
sConverted[i] = (0x7f & sAsArray[i]);
}

80
jdk/src/share/native/sun/misc/VM.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2014, 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
@ -33,84 +33,6 @@
#include "sun_misc_VM.h"
typedef jintArray (JNICALL *GET_THREAD_STATE_VALUES_FN)(JNIEnv *, jint);
typedef jobjectArray (JNICALL *GET_THREAD_STATE_NAMES_FN)(JNIEnv *, jint, jintArray);
static GET_THREAD_STATE_VALUES_FN GetThreadStateValues_fp = NULL;
static GET_THREAD_STATE_NAMES_FN GetThreadStateNames_fp = NULL;
static void get_thread_state_info(JNIEnv *env, jint state,
jobjectArray stateValues,
jobjectArray stateNames) {
char errmsg[128];
jintArray values;
jobjectArray names;
values = (*GetThreadStateValues_fp)(env, state);
if (values == NULL) {
sprintf(errmsg, "Mismatched VM version: Thread state (%d) "
"not supported", state);
JNU_ThrowInternalError(env, errmsg);
return;
}
/* state is also used as the index in the array */
(*env)->SetObjectArrayElement(env, stateValues, state, values);
names = (*GetThreadStateNames_fp)(env, state, values);
if (names == NULL) {
sprintf(errmsg, "Mismatched VM version: Thread state (%d) "
"not supported", state);
JNU_ThrowInternalError(env, errmsg);
return;
}
(*env)->SetObjectArrayElement(env, stateNames, state, names);
}
JNIEXPORT void JNICALL
Java_sun_misc_VM_getThreadStateValues(JNIEnv *env, jclass cls,
jobjectArray values,
jobjectArray names)
{
char errmsg[128];
// check if the number of Thread.State enum constants
// matches the number of states defined in jvm.h
jsize len1 = (*env)->GetArrayLength(env, values);
jsize len2 = (*env)->GetArrayLength(env, names);
if (len1 != JAVA_THREAD_STATE_COUNT || len2 != JAVA_THREAD_STATE_COUNT) {
sprintf(errmsg, "Mismatched VM version: JAVA_THREAD_STATE_COUNT = %d "
" but JDK expects %d / %d",
JAVA_THREAD_STATE_COUNT, len1, len2);
JNU_ThrowInternalError(env, errmsg);
return;
}
if (GetThreadStateValues_fp == NULL) {
GetThreadStateValues_fp = (GET_THREAD_STATE_VALUES_FN)
JDK_FindJvmEntry("JVM_GetThreadStateValues");
if (GetThreadStateValues_fp == NULL) {
JNU_ThrowInternalError(env,
"Mismatched VM version: JVM_GetThreadStateValues not found");
return;
}
GetThreadStateNames_fp = (GET_THREAD_STATE_NAMES_FN)
JDK_FindJvmEntry("JVM_GetThreadStateNames");
if (GetThreadStateNames_fp == NULL) {
JNU_ThrowInternalError(env,
"Mismatched VM version: JVM_GetThreadStateNames not found");
return ;
}
}
get_thread_state_info(env, JAVA_THREAD_STATE_NEW, values, names);
get_thread_state_info(env, JAVA_THREAD_STATE_RUNNABLE, values, names);
get_thread_state_info(env, JAVA_THREAD_STATE_BLOCKED, values, names);
get_thread_state_info(env, JAVA_THREAD_STATE_WAITING, values, names);
get_thread_state_info(env, JAVA_THREAD_STATE_TIMED_WAITING, values, names);
get_thread_state_info(env, JAVA_THREAD_STATE_TERMINATED, values, names);
}
JNIEXPORT jobject JNICALL
Java_sun_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) {
return JVM_LatestUserDefinedLoader(env);

44
jdk/src/share/native/sun/misc/Version.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2014, 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
@ -34,44 +34,13 @@ char jvm_special_version = '\0';
char jdk_special_version = '\0';
static void setStaticIntField(JNIEnv* env, jclass cls, const char* name, jint value)
{
char errmsg[100];
jfieldID fid;
fid = (*env)->GetStaticFieldID(env, cls, name, "I");
if (fid != 0) {
(*env)->SetStaticIntField(env, cls, fid, value);
} else {
sprintf(errmsg, "Static int field %s not found", name);
JNU_ThrowInternalError(env, errmsg);
}
}
static void setStaticBooleanField(JNIEnv* env, jclass cls, const char* name, jboolean value)
{
char errmsg[100];
jfieldID fid;
fid = (*env)->GetStaticFieldID(env, cls, name, "Z");
if (fid != 0) {
(*env)->SetStaticBooleanField(env, cls, fid, value);
} else {
sprintf(errmsg, "Static boolean field %s not found", name);
JNU_ThrowInternalError(env, errmsg);
}
}
static void setStaticStringField(JNIEnv* env, jclass cls, const char* name, jstring value)
{
char errmsg[100];
jfieldID fid;
fid = (*env)->GetStaticFieldID(env, cls, name, "Ljava/lang/String");
if (fid != 0) {
(*env)->SetStaticObjectField(env, cls, fid, value);
} else {
sprintf(errmsg, "Static String field %s not found", name);
JNU_ThrowInternalError(env, errmsg);
}
}
typedef void (JNICALL *GetJvmVersionInfo_fp)(JNIEnv*, jvm_version_info*, size_t);
JNIEXPORT jboolean JNICALL
@ -82,6 +51,7 @@ Java_sun_misc_Version_getJvmVersionInfo(JNIEnv *env, jclass cls)
if (!JDK_InitJvmHandle()) {
JNU_ThrowInternalError(env, "Handle for JVM not found for symbol lookup");
return JNI_FALSE;
}
func_p = (GetJvmVersionInfo_fp) JDK_FindJvmEntry("JVM_GetVersionInfo");
if (func_p == NULL) {
@ -90,10 +60,15 @@ Java_sun_misc_Version_getJvmVersionInfo(JNIEnv *env, jclass cls)
(*func_p)(env, &info, sizeof(info));
setStaticIntField(env, cls, "jvm_major_version", JVM_VERSION_MAJOR(info.jvm_version));
CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
setStaticIntField(env, cls, "jvm_minor_version", JVM_VERSION_MINOR(info.jvm_version));
CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
setStaticIntField(env, cls, "jvm_micro_version", JVM_VERSION_MICRO(info.jvm_version));
CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
setStaticIntField(env, cls, "jvm_build_number", JVM_VERSION_BUILD(info.jvm_version));
CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
setStaticIntField(env, cls, "jvm_update_version", info.update_version);
CHECK_EXCEPTION_RETURN(env, JNI_FALSE);
jvm_special_version = info.special_update_version;
return JNI_TRUE;
@ -116,10 +91,15 @@ Java_sun_misc_Version_getJdkVersionInfo(JNIEnv *env, jclass cls)
JDK_GetVersionInfo0(&info, sizeof(info));
setStaticIntField(env, cls, "jdk_major_version", JDK_VERSION_MAJOR(info.jdk_version));
CHECK_EXCEPTION(env);
setStaticIntField(env, cls, "jdk_minor_version", JDK_VERSION_MINOR(info.jdk_version));
CHECK_EXCEPTION(env);
setStaticIntField(env, cls, "jdk_micro_version", JDK_VERSION_MICRO(info.jdk_version));
CHECK_EXCEPTION(env);
setStaticIntField(env, cls, "jdk_build_number", JDK_VERSION_BUILD(info.jdk_version));
CHECK_EXCEPTION(env);
setStaticIntField(env, cls, "jdk_update_version", info.update_version);
CHECK_EXCEPTION(env);
jdk_special_version = info.special_update_version;
}