Commit 0f367979 authored by Lubomir Bulej's avatar Lubomir Bulej
Browse files

Update JNI and JVMTI headers to Java 9

parent 2f59e0c0
/*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2016, 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
......@@ -765,6 +765,11 @@ struct JNINativeInterface_ {
jobjectRefType (JNICALL *GetObjectRefType)
(JNIEnv* env, jobject obj);
/* Module Features */
jobject (JNICALL *GetModule)
(JNIEnv* env, jclass clazz);
};
/*
......@@ -1857,6 +1862,12 @@ struct JNIEnv_ {
return functions->GetObjectRefType(this, obj);
}
/* Module Features */
jobject GetModule(jclass clazz) {
return functions->GetModule(this, clazz);
}
#endif /* __cplusplus */
};
......@@ -1952,6 +1963,7 @@ JNI_OnUnload(JavaVM *vm, void *reserved);
#define JNI_VERSION_1_4 0x00010004
#define JNI_VERSION_1_6 0x00010006
#define JNI_VERSION_1_8 0x00010008
#define JNI_VERSION_9 0x00090000
#ifdef __cplusplus
} /* extern "C" */
......
/*
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2017, 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
......@@ -23,8 +23,7 @@
* questions.
*/
/* AUTOMATICALLY GENERATED FILE - DO NOT EDIT */
/* AUTOMATICALLY GENERATED FILE - DO NOT EDIT */
/* Include file for the Java(tm) Virtual Machine Tool Interface */
......@@ -42,8 +41,9 @@ enum {
JVMTI_VERSION_1_0 = 0x30010000,
JVMTI_VERSION_1_1 = 0x30010100,
JVMTI_VERSION_1_2 = 0x30010200,
JVMTI_VERSION_9 = 0x30090000,
JVMTI_VERSION = 0x30000000 + (1 * 0x10000) + (2 * 0x100) + 1 /* version: 1.2.1 */
JVMTI_VERSION = 0x30000000 + (9 * 0x10000) + (0 * 0x100) + 0 /* version: 9.0.0 */
};
JNIEXPORT jint JNICALL
......@@ -348,6 +348,7 @@ typedef enum {
JVMTI_ERROR_INVALID_METHODID = 23,
JVMTI_ERROR_INVALID_LOCATION = 24,
JVMTI_ERROR_INVALID_FIELDID = 25,
JVMTI_ERROR_INVALID_MODULE = 26,
JVMTI_ERROR_NO_MORE_FRAMES = 31,
JVMTI_ERROR_OPAQUE_FRAME = 32,
JVMTI_ERROR_TYPE_MISMATCH = 34,
......@@ -370,6 +371,7 @@ typedef enum {
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED = 70,
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED = 71,
JVMTI_ERROR_UNMODIFIABLE_CLASS = 79,
JVMTI_ERROR_UNMODIFIABLE_MODULE = 80,
JVMTI_ERROR_NOT_AVAILABLE = 98,
JVMTI_ERROR_MUST_POSSESS_CAPABILITY = 99,
JVMTI_ERROR_NULL_POINTER = 100,
......@@ -703,7 +705,9 @@ typedef struct {
unsigned int can_retransform_any_class : 1;
unsigned int can_generate_resource_exhaustion_heap_events : 1;
unsigned int can_generate_resource_exhaustion_threads_events : 1;
unsigned int : 7;
unsigned int can_generate_early_vmstart : 1;
unsigned int can_generate_early_class_hook_events : 1;
unsigned int : 5;
unsigned int : 16;
unsigned int : 16;
unsigned int : 16;
......@@ -1011,8 +1015,10 @@ typedef struct jvmtiInterface_1_ {
jthread event_thread,
...);
/* 3 : RESERVED */
void *reserved3;
/* 3 : Get All Modules */
jvmtiError (JNICALL *GetAllModules) (jvmtiEnv* env,
jint* module_count_ptr,
jobject** modules_ptr);
/* 4 : Get All Threads */
jvmtiError (JNICALL *GetAllThreads) (jvmtiEnv* env,
......@@ -1213,8 +1219,11 @@ typedef struct jvmtiInterface_1_ {
jmethodID method,
jlocation location);
/* 40 : RESERVED */
void *reserved40;
/* 40 : Get Named Module */
jvmtiError (JNICALL *GetNamedModule) (jvmtiEnv* env,
jobject class_loader,
const char* package_name,
jobject* module_ptr);
/* 41 : Set Field Access Watch */
jvmtiError (JNICALL *SetFieldAccessWatch) (jvmtiEnv* env,
......@@ -1492,23 +1501,38 @@ typedef struct jvmtiInterface_1_ {
const jthread* request_list,
jvmtiError* results);
/* 94 : RESERVED */
void *reserved94;
/* 95 : RESERVED */
void *reserved95;
/* 96 : RESERVED */
void *reserved96;
/* 97 : RESERVED */
void *reserved97;
/* 98 : RESERVED */
void *reserved98;
/* 99 : RESERVED */
void *reserved99;
/* 94 : Add Module Reads */
jvmtiError (JNICALL *AddModuleReads) (jvmtiEnv* env,
jobject module,
jobject to_module);
/* 95 : Add Module Exports */
jvmtiError (JNICALL *AddModuleExports) (jvmtiEnv* env,
jobject module,
const char* pkg_name,
jobject to_module);
/* 96 : Add Module Opens */
jvmtiError (JNICALL *AddModuleOpens) (jvmtiEnv* env,
jobject module,
const char* pkg_name,
jobject to_module);
/* 97 : Add Module Uses */
jvmtiError (JNICALL *AddModuleUses) (jvmtiEnv* env,
jobject module,
jclass service);
/* 98 : Add Module Provides */
jvmtiError (JNICALL *AddModuleProvides) (jvmtiEnv* env,
jobject module,
jclass service,
jclass impl_class);
/* 99 : Is Modifiable Module */
jvmtiError (JNICALL *IsModifiableModule) (jvmtiEnv* env,
jobject module,
jboolean* is_modifiable_module_ptr);
/* 100 : Get All Stack Traces */
jvmtiError (JNICALL *GetAllStackTraces) (jvmtiEnv* env,
......@@ -1675,7 +1699,7 @@ typedef struct jvmtiInterface_1_ {
/* 132 : Set System Property */
jvmtiError (JNICALL *SetSystemProperty) (jvmtiEnv* env,
const char* property,
const char* value);
const char* value_ptr);
/* 133 : Get Phase */
jvmtiError (JNICALL *GetPhase) (jvmtiEnv* env,
......@@ -2137,6 +2161,50 @@ struct _jvmtiEnv {
return functions->ClearFieldModificationWatch(this, klass, field);
}
jvmtiError GetAllModules(jint* module_count_ptr,
jobject** modules_ptr) {
return functions->GetAllModules(this, module_count_ptr, modules_ptr);
}
jvmtiError GetNamedModule(jobject class_loader,
const char* package_name,
jobject* module_ptr) {
return functions->GetNamedModule(this, class_loader, package_name, module_ptr);
}
jvmtiError AddModuleReads(jobject module,
jobject to_module) {
return functions->AddModuleReads(this, module, to_module);
}
jvmtiError AddModuleExports(jobject module,
const char* pkg_name,
jobject to_module) {
return functions->AddModuleExports(this, module, pkg_name, to_module);
}
jvmtiError AddModuleOpens(jobject module,
const char* pkg_name,
jobject to_module) {
return functions->AddModuleOpens(this, module, pkg_name, to_module);
}
jvmtiError AddModuleUses(jobject module,
jclass service) {
return functions->AddModuleUses(this, module, service);
}
jvmtiError AddModuleProvides(jobject module,
jclass service,
jclass impl_class) {
return functions->AddModuleProvides(this, module, service, impl_class);
}
jvmtiError IsModifiableModule(jobject module,
jboolean* is_modifiable_module_ptr) {
return functions->IsModifiableModule(this, module, is_modifiable_module_ptr);
}
jvmtiError GetLoadedClasses(jint* class_count_ptr,
jclass** classes_ptr) {
return functions->GetLoadedClasses(this, class_count_ptr, classes_ptr);
......@@ -2484,8 +2552,8 @@ struct _jvmtiEnv {
}
jvmtiError SetSystemProperty(const char* property,
const char* value) {
return functions->SetSystemProperty(this, property, value);
const char* value_ptr) {
return functions->SetSystemProperty(this, property, value_ptr);
}
jvmtiError GetPhase(jvmtiPhase* phase_ptr) {
......@@ -2531,4 +2599,3 @@ struct _jvmtiEnv {
#endif /* __cplusplus */
#endif /* !_JAVA_JVMTI_H_ */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment