jvmti.h: Update from Classpath to get latest fixes and improvements.

* include/jvmti.h: Update from Classpath to get latest fixes and
        improvements.

From-SVN: r116610
This commit is contained in:
Keith Seitz 2006-08-31 22:37:48 +00:00 committed by Keith Seitz
parent acf3d3f8bf
commit 9d5941eea8
2 changed files with 20 additions and 11 deletions

View file

@ -1,3 +1,8 @@
2006-08-31 Keith Seitz <keiths@redhat.com>
* include/jvmti.h: Update from Classpath to get latest fixes and
improvements.
2006-08-29 Gary Benson <gbenson@redhat.com> 2006-08-29 Gary Benson <gbenson@redhat.com>
* java/net/SocketPermission.java * java/net/SocketPermission.java

View file

@ -45,6 +45,8 @@ exception statement from your version. */
#define _CLASSPATH_JVMTI_H #define _CLASSPATH_JVMTI_H
#include <jni.h> #include <jni.h>
#include "jvmti_md.h"
/* The VM might define JVMTI base types */ /* The VM might define JVMTI base types */
#ifndef _CLASSPATH_VM_JVMTI_TYPES_DEFINED #ifndef _CLASSPATH_VM_JVMTI_TYPES_DEFINED
@ -79,7 +81,7 @@ typedef struct _jvmtiAddrLocationMap jvmtiAddrLocationMap;
#ifdef __cplusplus #ifdef __cplusplus
typedef struct _Jv_JVMTIEnv jvmtiEnv; typedef struct _Jv_JVMTIEnv jvmtiEnv;
#else #else
typedef const struct _Jv_jvmtiEnv jvmtiEnv; typedef const struct _Jv_jvmtiEnv *jvmtiEnv;
#endif #endif
/* /*
@ -140,7 +142,7 @@ typedef enum
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED = 70, JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED = 70,
JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED = 71, JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED = 71,
JVMTI_ERROR_MUST_POSSESS_CAPABILITY = 99, JVMTI_ERROR_MUST_POSSESS_CAPABILITY = 99,
JVMTI_ERROR_ILLEGAL_ARGUMENT = 103, JVMTI_ERROR_ILLEGAL_ARGUMENT = 103
} jvmtiError; } jvmtiError;
/* /*
@ -283,7 +285,7 @@ typedef enum
JVMTI_EVENT_EXCEPTION_CATCH = 59, JVMTI_EVENT_EXCEPTION_CATCH = 59,
JVMTI_EVENT_SINGLE_STEP = 60, JVMTI_EVENT_SINGLE_STEP = 60,
JVMTI_EVENT_FRAME_POP = 61, JVMTI_EVENT_FRAME_POP = 61,
JVMTI_EVENT_BERAKPOINT = 62, JVMTI_EVENT_BREAKPOINT = 62,
JVMTI_EVENT_FIELD_ACCESS = 63, JVMTI_EVENT_FIELD_ACCESS = 63,
JVMTI_EVENT_FIELD_MODIFICATION = 64, JVMTI_EVENT_FIELD_MODIFICATION = 64,
JVMTI_EVENT_METHOD_ENTRY = 65, JVMTI_EVENT_METHOD_ENTRY = 65,
@ -658,7 +660,8 @@ struct _Jv_jvmtiEnv
jthread thread); jthread thread);
jvmtiError (JNICALL *StopThread) (jvmtiEnv *env, jvmtiError (JNICALL *StopThread) (jvmtiEnv *env,
jthread thread); jthread thread,
jobject exception);
jvmtiError (JNICALL *InterruptThread) (jvmtiEnv *env, jvmtiError (JNICALL *InterruptThread) (jvmtiEnv *env,
jthread thread); jthread thread);
@ -790,7 +793,8 @@ struct _Jv_jvmtiEnv
jrawMonitorID monitor); jrawMonitorID monitor);
jvmtiError (JNICALL *RawMonitorWait) (jvmtiEnv *env, jvmtiError (JNICALL *RawMonitorWait) (jvmtiEnv *env,
jrawMonitorID monitor); jrawMonitorID monitor,
jlong millis);
jvmtiError (JNICALL *RawMonitorNotify) (jvmtiEnv *env, jvmtiError (JNICALL *RawMonitorNotify) (jvmtiEnv *env,
jrawMonitorID monitor); jrawMonitorID monitor);
@ -844,7 +848,7 @@ struct _Jv_jvmtiEnv
jvmtiError (JNICALL *GetSourceFileName) (jvmtiEnv *env, jvmtiError (JNICALL *GetSourceFileName) (jvmtiEnv *env,
jclass klass, jclass klass,
char *source_name_ptr); char **source_name_ptr);
jvmtiError (JNICALL *GetClassModifiers) (jvmtiEnv *env, jvmtiError (JNICALL *GetClassModifiers) (jvmtiEnv *env,
jclass klass, jclass klass,
@ -1249,8 +1253,8 @@ class _Jv_JVMTIEnv
jvmtiError ResumeThread (jthread thread) jvmtiError ResumeThread (jthread thread)
{ return p->ResumeThread (this, thread); } { return p->ResumeThread (this, thread); }
jvmtiError StopThread (jthread thread) jvmtiError StopThread (jthread thread, jobject exception)
{ return p->StopThread (this, thread); } { return p->StopThread (this, thread, exception); }
jvmtiError InterruptThread (jthread thread) jvmtiError InterruptThread (jthread thread)
{ return p->InterruptThread (this, thread); } { return p->InterruptThread (this, thread); }
@ -1360,8 +1364,8 @@ class _Jv_JVMTIEnv
jvmtiError RawMonitorExit (jrawMonitorID monitor) jvmtiError RawMonitorExit (jrawMonitorID monitor)
{ return p->RawMonitorExit (this, monitor); } { return p->RawMonitorExit (this, monitor); }
jvmtiError RawMonitorWait (jrawMonitorID monitor) jvmtiError RawMonitorWait (jrawMonitorID monitor, jlong millis)
{ return p->RawMonitorWait (this, monitor); } { return p->RawMonitorWait (this, monitor, millis); }
jvmtiError RawMonitorNotify (jrawMonitorID monitor) jvmtiError RawMonitorNotify (jrawMonitorID monitor)
{ return p->RawMonitorNotify (this, monitor); } { return p->RawMonitorNotify (this, monitor); }
@ -1400,7 +1404,7 @@ class _Jv_JVMTIEnv
jvmtiError GetClassStatus (jclass klass, jint *status_ptr) jvmtiError GetClassStatus (jclass klass, jint *status_ptr)
{ return p->GetClassStatus (this, klass, status_ptr); } { return p->GetClassStatus (this, klass, status_ptr); }
jvmtiError GetSourceFileName (jclass klass, char *source_name_ptr) jvmtiError GetSourceFileName (jclass klass, char **source_name_ptr)
{ return p->GetSourceFileName (this, klass, source_name_ptr); } { return p->GetSourceFileName (this, klass, source_name_ptr); }
jvmtiError GetClassModifiers (jclass klass, jint *modifiers_ptr) jvmtiError GetClassModifiers (jclass klass, jint *modifiers_ptr)