diff options
| author | Keith Seitz <keiths@redhat.com> | 2006-08-31 21:15:24 +0000 |
|---|---|---|
| committer | Keith Seitz <keiths@redhat.com> | 2006-08-31 21:15:24 +0000 |
| commit | 9c92019b727abd6930689bae675fecd3e73c5f1e (patch) | |
| tree | b30164927d80e23c8b2e5ae4470d5e6353ba6f17 | |
| parent | 3d02418b0b5c5f67aa79b951ac07f89a8a1913ef (diff) | |
| download | classpath-9c92019b727abd6930689bae675fecd3e73c5f1e.tar.gz | |
From Martin Platter <motse@complang.tuwien.ac.at>:
* Makefile.am (include_HEADERS): Include jvmti.h.
* include/jvmti.h (jvmtiEnv) [!__cplusplus]: Add missing '*'.
(jvmtiError): Remove superfluous comma after last entry.
(jvmtiEvent): It's "BREAKPOINT" not "BERAKPOINT".
(_Jv_jvmtiEnv.StopThread): Add missing exception parameter.
(_Jv_jvmtiEnv.RawMonitorWait): Add missing millis parameter.
(_Jv_jvmtiEnv.GetSourceFileName): source_name_ptr is pointer to
character pointer.
(_Jv_JVMTIEnv::StopThread): Add missing exception parameter.
(_Jv_JVMTIEnv::RawMonitorWait): Add missing millis parameter.
(_Jv_JVMTIEnv::GetSourceFileName): source_name_ptr is pointer to
character pointer.
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | include/jvmti.h | 24 |
2 files changed, 29 insertions, 11 deletions
@@ -1,3 +1,19 @@ +2006-08-31 Keith Seitz <keiths@redhat.com> + + From Martin Platter <motse@complang.tuwien.ac.at>: + * Makefile.am (include_HEADERS): Include jvmti.h. + * include/jvmti.h (jvmtiEnv) [!__cplusplus]: Add missing '*'. + (jvmtiError): Remove superfluous comma after last entry. + (jvmtiEvent): It's "BREAKPOINT" not "BERAKPOINT". + (_Jv_jvmtiEnv.StopThread): Add missing exception parameter. + (_Jv_jvmtiEnv.RawMonitorWait): Add missing millis parameter. + (_Jv_jvmtiEnv.GetSourceFileName): source_name_ptr is pointer to + character pointer. + (_Jv_JVMTIEnv::StopThread): Add missing exception parameter. + (_Jv_JVMTIEnv::RawMonitorWait): Add missing millis parameter. + (_Jv_JVMTIEnv::GetSourceFileName): source_name_ptr is pointer to + character pointer. + 2006-08-31 Roman Kennke <kennke@aicas.com> * javax/swing/text/BoxView.java diff --git a/include/jvmti.h b/include/jvmti.h index 23419f920..d2937c8b9 100644 --- a/include/jvmti.h +++ b/include/jvmti.h @@ -79,7 +79,7 @@ typedef struct _jvmtiAddrLocationMap jvmtiAddrLocationMap; #ifdef __cplusplus typedef struct _Jv_JVMTIEnv jvmtiEnv; #else -typedef const struct _Jv_jvmtiEnv jvmtiEnv; +typedef const struct _Jv_jvmtiEnv *jvmtiEnv; #endif /* @@ -140,7 +140,7 @@ typedef enum JVMTI_ERROR_UNSUPPORTED_REDEFINITION_CLASS_MODIFIERS_CHANGED = 70, JVMTI_ERROR_UNSUPPORTED_REDEFINITION_METHOD_MODIFIERS_CHANGED = 71, JVMTI_ERROR_MUST_POSSESS_CAPABILITY = 99, - JVMTI_ERROR_ILLEGAL_ARGUMENT = 103, + JVMTI_ERROR_ILLEGAL_ARGUMENT = 103 } jvmtiError; /* @@ -283,7 +283,7 @@ typedef enum JVMTI_EVENT_EXCEPTION_CATCH = 59, JVMTI_EVENT_SINGLE_STEP = 60, JVMTI_EVENT_FRAME_POP = 61, - JVMTI_EVENT_BERAKPOINT = 62, + JVMTI_EVENT_BREAKPOINT = 62, JVMTI_EVENT_FIELD_ACCESS = 63, JVMTI_EVENT_FIELD_MODIFICATION = 64, JVMTI_EVENT_METHOD_ENTRY = 65, @@ -658,7 +658,8 @@ struct _Jv_jvmtiEnv jthread thread); jvmtiError (JNICALL *StopThread) (jvmtiEnv *env, - jthread thread); + jthread thread, + jobject exception); jvmtiError (JNICALL *InterruptThread) (jvmtiEnv *env, jthread thread); @@ -790,7 +791,8 @@ struct _Jv_jvmtiEnv jrawMonitorID monitor); jvmtiError (JNICALL *RawMonitorWait) (jvmtiEnv *env, - jrawMonitorID monitor); + jrawMonitorID monitor, + jlong millis); jvmtiError (JNICALL *RawMonitorNotify) (jvmtiEnv *env, jrawMonitorID monitor); @@ -844,7 +846,7 @@ struct _Jv_jvmtiEnv jvmtiError (JNICALL *GetSourceFileName) (jvmtiEnv *env, jclass klass, - char *source_name_ptr); + char **source_name_ptr); jvmtiError (JNICALL *GetClassModifiers) (jvmtiEnv *env, jclass klass, @@ -1249,8 +1251,8 @@ class _Jv_JVMTIEnv jvmtiError ResumeThread (jthread thread) { return p->ResumeThread (this, thread); } - jvmtiError StopThread (jthread thread) - { return p->StopThread (this, thread); } + jvmtiError StopThread (jthread thread, jobject exception) + { return p->StopThread (this, thread, exception); } jvmtiError InterruptThread (jthread thread) { return p->InterruptThread (this, thread); } @@ -1360,8 +1362,8 @@ class _Jv_JVMTIEnv jvmtiError RawMonitorExit (jrawMonitorID monitor) { return p->RawMonitorExit (this, monitor); } - jvmtiError RawMonitorWait (jrawMonitorID monitor) - { return p->RawMonitorWait (this, monitor); } + jvmtiError RawMonitorWait (jrawMonitorID monitor, jlong millis) + { return p->RawMonitorWait (this, monitor, millis); } jvmtiError RawMonitorNotify (jrawMonitorID monitor) { return p->RawMonitorNotify (this, monitor); } @@ -1400,7 +1402,7 @@ class _Jv_JVMTIEnv jvmtiError GetClassStatus (jclass klass, jint *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); } jvmtiError GetClassModifiers (jclass klass, jint *modifiers_ptr) |